Merge branch 'master' into db-498-user-certs

EventStore · Feb 28, 2024 · 939e9bc · 939e9bc
2 parents 6013a3b + e65f330
commit 939e9bc
Show file tree

Hide file tree

Showing 425 changed files with 20,694 additions and 17,917 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -13,10 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        framework: [net5.0, net6.0, net7.0]
-        os: [ubuntu-latest]
-        test: [Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement]
-        configuration: [release]
+        framework: [ net6.0, net7.0, net8.0 ]
+        os: [ ubuntu-latest ]
+        test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
+        configuration: [ release ]
     runs-on: ${{ matrix.os }}
     name: EventStore.Client.${{ matrix.test }}/${{ matrix.os }}/${{ matrix.framework }}/${{ inputs.docker-tag }}
     steps:
@@ -33,9 +33,9 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            5.0.x
             6.0.x
             7.0.x
+            8.0.x
       - name: Compile
         shell: bash
         run: |
@@ -45,7 +45,7 @@ jobs:
         env:
           ES_DOCKER_TAG: ${{ inputs.docker-tag }}
         run: |
-          ./gencert.sh
+          sudo ./gencert.sh
           dotnet test --configuration ${{ matrix.configuration }} --blame \
             --logger:"GitHubActions;report-warnings=false" --logger:"console;verbosity=normal" \
             --framework ${{ matrix.framework }} \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,9 +4,9 @@ on:
   pull_request:
   push:
     branches:
-    - master
+      - master
     tags:
-    - v*
+      - v*
 
 jobs:
   test:

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
@@ -1,15 +1,15 @@
 name: "Dispatch"
 
 on:
-    workflow_dispatch:
-        inputs:
-            version:
-                description: "Docker tag version"
-                required: true
-                type: string
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Docker tag version"
+        required: true
+        type: string
 
 jobs:
-    test:
-        uses: ./.github/workflows/base.yml
-        with:
-            docker-tag: ${{ inputs.version }}
+  test:
+    uses: ./.github/workflows/base.yml
+    with:
+      docker-tag: ${{ inputs.version }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        framework: [ net5.0, net6.0, net7.0 ]
+        framework: [ net6.0, net7.0, net8.0 ]
         os: [ ubuntu-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     name: scan-vulnerabilities/${{ matrix.os }}/${{ matrix.framework }}
@@ -25,9 +25,9 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            5.0.x
             6.0.x
             7.0.x
+            8.0.x
       - name: Scan for Vulnerabilities
         shell: bash
         run: |
@@ -43,13 +43,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        framework: [ net5.0, net6.0, net7.0 ]
+        framework: [ net8.0 ]
     services:
       esdb:
         image: ghcr.io/eventstore/eventstore:lts
         env:
           EVENTSTORE_INSECURE: true
-          EVENTSTORE_MEMDB: true
+          EVENTSTORE_MEM_DB: false
           EVENTSTORE_RUN_PROJECTIONS: all
           EVENTSTORE_START_STANDARD_PROJECTIONS: true
         ports:
@@ -62,9 +62,7 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            5.0.x
-            6.0.x
-            7.0.x
+            8.0.x
       - name: Compile
         shell: bash
         run: |
@@ -75,13 +73,13 @@ jobs:
           find samples/ -type f -iname "*.csproj" -print0 | xargs -0L1 dotnet run --framework ${{ matrix.framework }} --project
 
   test:
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
-        framework: [net5.0, net6.0, net7.0]
-        os: [ubuntu-latest, windows-latest]
-        configuration: [release]
+        framework: [ net6.0, net7.0, net8.0 ]
+        os: [ ubuntu-latest, windows-latest ]
+        configuration: [ release ]
     runs-on: ${{ matrix.os }}
     name: test/EventStore.Client/${{ matrix.os }}/${{ matrix.framework }}
     steps:
@@ -94,9 +92,9 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            5.0.x
             6.0.x
             7.0.x
+            8.0.x
       - name: Compile
         shell: bash
         run: |
@@ -132,9 +130,9 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            5.0.x
             6.0.x
             7.0.x
+            8.0.x
       - name: Dotnet Pack
         shell: bash
         run: |
@@ -161,5 +159,4 @@ jobs:
         run: |
           dotnet nuget list source
           dotnet tool restore
-          find . -name "*.nupkg" | xargs -n1 dotnet nuget push --api-key=${{ secrets.nuget_key }} --source https://api.nuget.org/v3/index.json --skip-duplicate
-    
+          find . -name "*.nupkg" | xargs -n1 dotnet nuget push --api-key=${{ secrets.nuget_key }} --source https://api.nuget.org/v3/index.json --skip-duplicate
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,19 +1,24 @@
 <Project>
-	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
-		<Platform>x64</Platform>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Nullable>enable</Nullable>
-		<NullableContextOptions>enable</NullableContextOptions>
-		<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>
-		<RootNamespace>EventStore.Client</RootNamespace>
-		<UseLinkBase>true</UseLinkBase>
-		<GrpcPackageVersion>2.49.0</GrpcPackageVersion>
-		<GrpcToolsPackageVersion>2.50.0</GrpcToolsPackageVersion>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>net48;net6.0;net7.0;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.59.0</GrpcPackageVersion>
+        <GrpcToolsPackageVersion>2.59.0</GrpcToolsPackageVersion>
+    </PropertyGroup>
+
+		<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+			<Reference Include="System.Net.Http"/>
+			<Reference Include="System.Web"/>
+		</ItemGroup>
 </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 b/EventStore.Client.sln
@@ -31,9 +31,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.Persisten
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.UserManagement.Tests", "test\EventStore.Client.UserManagement.Tests\EventStore.Client.UserManagement.Tests.csproj", "{22634CEE-4F7B-4679-A48D-38A2A8580ECA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "generators", "generators", "{57BAB29D-F8A8-47C7-B426-89A1929ADD70}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Tests.SourceGenerators", "generators\EventStore.Tests.SourceGenerators\EventStore.Tests.SourceGenerators.csproj", "{5912BD08-DA99-49B7-A2C0-C1BA42D209CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.Tests.Common", "test\EventStore.Client.Tests.Common\EventStore.Client.Tests.Common.csproj", "{E326832D-DE52-4DE4-9E54-C800908B75F3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -92,10 +90,10 @@ Global
 		{22634CEE-4F7B-4679-A48D-38A2A8580ECA}.Debug|x64.Build.0 = Debug|Any CPU
 		{22634CEE-4F7B-4679-A48D-38A2A8580ECA}.Release|x64.ActiveCfg = Release|Any CPU
 		{22634CEE-4F7B-4679-A48D-38A2A8580ECA}.Release|x64.Build.0 = Release|Any CPU
-		{5912BD08-DA99-49B7-A2C0-C1BA42D209CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5912BD08-DA99-49B7-A2C0-C1BA42D209CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{5912BD08-DA99-49B7-A2C0-C1BA42D209CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{5912BD08-DA99-49B7-A2C0-C1BA42D209CB}.Release|x64.Build.0 = Release|Any CPU
+		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D3744A86-DD35-4104-AAEE-84B79062C4A2} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
@@ -110,6 +108,6 @@ Global
 		{FC829F1B-43AD-4C96-9002-23D04BBA3AF3} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 		{6CEB731F-72E1-461F-A6B3-54DBF3FD786C} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 		{22634CEE-4F7B-4679-A48D-38A2A8580ECA} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
-		{5912BD08-DA99-49B7-A2C0-C1BA42D209CB} = {57BAB29D-F8A8-47C7-B426-89A1929ADD70}
+		{E326832D-DE52-4DE4-9E54-C800908B75F3} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 	EndGlobalSection
 EndGlobal
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,9 +4,9 @@ on: @@
       pull_request:
       push:
         branches:
-        - master
+          - master
         tags:
-        - v*
+          - v*
     jobs:
       test:
@@ Expand Down @@