diff --git a/Orleans.sln b/Orleans.sln
index 4df07f0c88..b9967bcc95 100644
--- a/Orleans.sln
+++ b/Orleans.sln
@@ -77,8 +77,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TestFSharp", "test\Grains\T
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TestFSharpInterfaces", "test\Misc\TestFSharpInterfaces\TestFSharpInterfaces.fsproj", "{A4F61392-36A3-457C-80D0-9CDC48F5922F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Streaming.GCP", "src\Orleans.Streaming.GCP\Orleans.Streaming.GCP.csproj", "{6E5860C5-44E7-415C-80D6-3ECF15A80796}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestInternalGrainInterfaces", "test\Grains\TestInternalGrainInterfaces\TestInternalGrainInterfaces.csproj", "{EBD697E3-91BE-4844-B3F0-6997300A8C12}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Core.Abstractions", "src\Orleans.Core.Abstractions\Orleans.Core.Abstractions.csproj", "{73514686-D25D-478B-9943-A86F6B0F3A37}"
@@ -221,7 +219,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Serialization.Proto
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Streaming.AdoNet", "src\AdoNet\Orleans.Streaming.AdoNet\Orleans.Streaming.AdoNet.csproj", "{2B994F33-16CF-4679-936A-5AEABC529D2C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks.AdoNet", "test\Benchmarks.AdoNet\Benchmarks.AdoNet.csproj", "{B8F43537-2D2E-42A0-BE67-5E07E4313AEA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks.AdoNet", "test\Benchmarks.AdoNet\Benchmarks.AdoNet.csproj", "{B8F43537-2D2E-42A0-BE67-5E07E4313AEA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -361,10 +359,6 @@ Global
{A4F61392-36A3-457C-80D0-9CDC48F5922F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4F61392-36A3-457C-80D0-9CDC48F5922F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4F61392-36A3-457C-80D0-9CDC48F5922F}.Release|Any CPU.Build.0 = Release|Any CPU
- {6E5860C5-44E7-415C-80D6-3ECF15A80796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6E5860C5-44E7-415C-80D6-3ECF15A80796}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E5860C5-44E7-415C-80D6-3ECF15A80796}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6E5860C5-44E7-415C-80D6-3ECF15A80796}.Release|Any CPU.Build.0 = Release|Any CPU
{EBD697E3-91BE-4844-B3F0-6997300A8C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EBD697E3-91BE-4844-B3F0-6997300A8C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EBD697E3-91BE-4844-B3F0-6997300A8C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -633,7 +627,6 @@ Global
{6BA81672-10EA-4DA7-A620-3D60619FD39E} = {082D25DB-70CA-48F4-93E0-EC3455F494B8}
{8A652779-85EF-48E2-A639-1EED3CE2C39C} = {2A128E88-B281-4BFB-ADEB-E515437F2385}
{A4F61392-36A3-457C-80D0-9CDC48F5922F} = {70BCC54E-1618-4742-A079-07588065E361}
- {6E5860C5-44E7-415C-80D6-3ECF15A80796} = {FE2E08C6-9C3B-4AEE-AE07-CCA387580D7A}
{EBD697E3-91BE-4844-B3F0-6997300A8C12} = {2A128E88-B281-4BFB-ADEB-E515437F2385}
{73514686-D25D-478B-9943-A86F6B0F3A37} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{072B1B88-FE98-4354-86FA-AB6EF80EB9C4} = {3189037B-208D-40A1-A561-169D77D9BB5A}
diff --git a/src/Orleans.Streaming.GCP/GoogleErrorCodes.cs b/src/Orleans.Streaming.GCP/GoogleErrorCodes.cs
deleted file mode 100644
index ca736803db..0000000000
--- a/src/Orleans.Streaming.GCP/GoogleErrorCodes.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-namespace Orleans.Providers.GCP
-{
- internal enum GoogleErrorCode
- {
- GoogleErrorCodeBase = 1 << 24,
- Initializing = GoogleErrorCodeBase + 1,
- DeleteTopic = GoogleErrorCodeBase + 2,
- PublishMessage = GoogleErrorCodeBase + 3,
- GetMessages = GoogleErrorCodeBase + 4,
- DeleteMessage = GoogleErrorCodeBase + 5,
- AcknowledgeMessage = GoogleErrorCodeBase + 6
- }
-
- internal static class LoggerExtensions
- {
- internal static void Debug(this ILogger logger, GoogleErrorCode errorCode, string format, params object[] args)
- {
- logger.LogDebug((int)errorCode, format, args);
- }
-
- internal static void Trace(this ILogger logger, GoogleErrorCode errorCode, string format, params object[] args)
- {
- logger.LogTrace((int)errorCode, format, args);
- }
-
- internal static void Info(this ILogger logger, GoogleErrorCode errorCode, string format, params object[] args)
- {
- logger.LogInformation((int)errorCode, format, args);
- }
-
- internal static void Warn(this ILogger logger, GoogleErrorCode errorCode, string format, params object[] args)
- {
- logger.LogWarning((int)errorCode, format, args);
- }
-
- internal static void Warn(this ILogger logger, GoogleErrorCode errorCode, string message, Exception exception)
- {
- logger.LogWarning((int)errorCode, exception, message);
- }
-
- internal static void Error(this ILogger logger, GoogleErrorCode errorCode, string message, Exception exception = null)
- {
- logger.LogError((int)errorCode, exception, message);
- }
- }
-}
diff --git a/src/Orleans.Streaming.GCP/Hosting/ClientBuilderExtensions.cs b/src/Orleans.Streaming.GCP/Hosting/ClientBuilderExtensions.cs
deleted file mode 100644
index a13f019488..0000000000
--- a/src/Orleans.Streaming.GCP/Hosting/ClientBuilderExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using Orleans.Configuration;
-using Orleans.Providers.GCP.Streams.PubSub;
-
-namespace Orleans.Hosting
-{
- public static class ClientBuilderExtensions
- {
- ///
- /// Configure cluster client to use PubSub persistent streams.
- ///
- public static IClientBuilder AddPubSubStreams(
- this IClientBuilder builder,
- string name, Action configurePubSub)
- where TDataAdapter : IPubSubDataAdapter
- {
- builder.AddPubSubStreams(name, b=>b.ConfigurePubSub(ob => ob.Configure(configurePubSub)));
- return builder;
- }
-
- ///
- /// Configure cluster client to use PubSub persistent streams.
- ///
- public static IClientBuilder AddPubSubStreams(
- this IClientBuilder builder,
- string name, Action> configure)
- where TDataAdapter : IPubSubDataAdapter
- {
- var configurator = new ClusterClientPubSubStreamConfigurator(name, builder);
- configure?.Invoke(configurator);
- return builder;
- }
- }
-}
diff --git a/src/Orleans.Streaming.GCP/Hosting/SiloBuilderExtensions.cs b/src/Orleans.Streaming.GCP/Hosting/SiloBuilderExtensions.cs
deleted file mode 100644
index 6cac331588..0000000000
--- a/src/Orleans.Streaming.GCP/Hosting/SiloBuilderExtensions.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using Orleans.Configuration;
-using Orleans.Providers.GCP.Streams.PubSub;
-
-namespace Orleans.Hosting
-{
- public static class SiloBuilderExtensions
- {
- ///
- /// Configure silo to use PubSub persistent streams.
- ///
- public static ISiloBuilder AddPubSubStreams(
- this ISiloBuilder builder,
- string name, Action configurePubSub)
- where TDataAdapter : IPubSubDataAdapter
- {
- builder.AddPubSubStreams(name, b=>
- b.ConfigurePubSub(ob => ob.Configure(configurePubSub)));
- return builder;
- }
-
- ///
- /// Configure silo to use PubSub persistent streams.
- ///
- public static ISiloBuilder AddPubSubStreams(
- this ISiloBuilder builder,
- string name, Action> configure)
- where TDataAdapter : IPubSubDataAdapter
- {
- var configurator = new SiloPubSubStreamConfigurator(name,
- configureServicesDelegate => builder.ConfigureServices(configureServicesDelegate));
- configure?.Invoke(configurator);
- return builder;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Orleans.Streaming.GCP/Orleans.Streaming.GCP.csproj b/src/Orleans.Streaming.GCP/Orleans.Streaming.GCP.csproj
deleted file mode 100644
index a3c65f94e9..0000000000
--- a/src/Orleans.Streaming.GCP/Orleans.Streaming.GCP.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- Microsoft.Orleans.Streaming.GCP
- Microsoft Orleans Google Cloud Platform Streaming Provider
- Microsoft Orleans stream provider for Google Cloud Platform PubSub.
- $(PackageTags)
- $(DefaultTargetFrameworks)
- Orleans.Streaming.GCP
- Orleans.Providers.GCP
-
-
-
-
- false
-
-
-
-
-
-
-
-
diff --git a/src/Orleans.Streaming.GCP/Providers/Streams/PubSub/IPubSubDataAdapter.cs b/src/Orleans.Streaming.GCP/Providers/Streams/PubSub/IPubSubDataAdapter.cs
deleted file mode 100644
index a1011ebbf5..0000000000
--- a/src/Orleans.Streaming.GCP/Providers/Streams/PubSub/IPubSubDataAdapter.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Google.Cloud.PubSub.V1;
-using Google.Protobuf;
-using Microsoft.Extensions.DependencyInjection;
-using Orleans.Providers.Streams.Common;
-using Orleans.Runtime;
-using Orleans.Serialization;
-using Orleans.Streams;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Orleans.Providers.GCP.Streams.PubSub
-{
- ///
- /// Converts event data to and from cloud queue message
- ///
- public interface IPubSubDataAdapter
- {
- ///
- /// Creates a from stream event data.
- ///
- PubsubMessage ToPubSubMessage(StreamId streamId, IEnumerable events, Dictionary requestContext);
-
- ///
- /// Creates a batch container from a message
- ///
- IBatchContainer FromPullResponseMessage(PubsubMessage msg, long sequenceId);
- }
-
- [SerializationCallbacks(typeof(OnDeserializedCallbacks))]
- public class PubSubDataAdapter : IPubSubDataAdapter, IOnDeserialized
- {
- private Serializer _serializer;
-
- ///
- /// Initializes a new instance of the class.
- ///
- public PubSubDataAdapter(Serializer serializer)
- {
- _serializer = serializer;
- }
-
- ///
- public IBatchContainer FromPullResponseMessage(PubsubMessage msg, long sequenceId)
- {
- var batchContainer = _serializer.Deserialize(msg.Data.ToByteArray());
- batchContainer.RealSequenceToken = new EventSequenceTokenV2(sequenceId);
- return batchContainer;
- }
-
- ///
- public PubsubMessage ToPubSubMessage(StreamId streamId, IEnumerable events, Dictionary requestContext)
- {
- var batchMessage = new PubSubBatchContainer(streamId, events.Cast