Updating verison to 3.0.

makam · makam · commit 09b5d5cb32f4 · 2018-05-14T14:36:48.000-07:00
Resolved Merge conflicts
diff --git a/src/Microsoft.Azure.ServiceBus/Amqp/AmqpSubscriptionClient.cs b/src/Microsoft.Azure.ServiceBus/Amqp/AmqpSubscriptionClient.cs
@@ -61,7 +61,6 @@ public MessageReceiver InnerReceiver
                                 MessagingEntityType.Subscriber,
                                 this.ReceiveMode,
                                 this.ServiceBusConnection,
-                                null,
                                 this.CbsTokenProvider,
                                 this.RetryPolicy,
                                 this.PrefetchCount);
diff --git a/src/Microsoft.Azure.ServiceBus/Core/MessageReceiver.cs b/src/Microsoft.Azure.ServiceBus/Core/MessageReceiver.cs
@@ -153,7 +153,6 @@ internal MessageReceiver(
             MessagingEntityType? entityType,
             ReceiveMode receiveMode,
             ServiceBusConnection serviceBusConnection,
-            ITokenProvider tokenProvider,
             ICbsTokenProvider cbsTokenProvider,
             RetryPolicy retryPolicy,
             int prefetchCount = Constants.DefaultClientPrefetchCount,
diff --git a/src/Microsoft.Azure.ServiceBus/Core/MessageSender.cs b/src/Microsoft.Azure.ServiceBus/Core/MessageSender.cs
@@ -140,7 +140,6 @@ internal MessageSender(
             string transferDestinationPath,
             MessagingEntityType? entityType,
             ServiceBusConnection serviceBusConnection,
-            ITokenProvider tokenProvider,
             ICbsTokenProvider cbsTokenProvider,
             RetryPolicy retryPolicy)
             : base(nameof(MessageSender), entityPath, retryPolicy ?? RetryPolicy.Default)
diff --git a/src/Microsoft.Azure.ServiceBus/MessageSession.cs b/src/Microsoft.Azure.ServiceBus/MessageSession.cs
@@ -26,7 +26,7 @@ public MessageSession(
             int prefetchCount = Constants.DefaultClientPrefetchCount,
             string sessionId = null,
             bool isSessionReceiver = false)
-            : base(entityPath, entityType, receiveMode, serviceBusConnection, null, cbsTokenProvider, retryPolicy, prefetchCount, sessionId, isSessionReceiver)
+            : base(entityPath, entityType, receiveMode, serviceBusConnection, cbsTokenProvider, retryPolicy, prefetchCount, sessionId, isSessionReceiver)
         {
             this.diagnosticSource = new ServiceBusDiagnosticSource(entityPath, serviceBusConnection.Endpoint);
         }
diff --git a/src/Microsoft.Azure.ServiceBus/Microsoft.Azure.ServiceBus.csproj b/src/Microsoft.Azure.ServiceBus/Microsoft.Azure.ServiceBus.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>This is the next generation Azure Service Bus .NET Standard client library that focuses on queues &amp; topics. For more information about Service Bus, see https://azure.microsoft.com/en-us/services/service-bus/</Description>
-    <VersionPrefix>3.0.0-preview-01</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Microsoft</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyOriginatorKeyFile>../../build/keyfile.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Microsoft.Azure.ServiceBus/QueueClient.cs b/src/Microsoft.Azure.ServiceBus/QueueClient.cs
@@ -239,7 +239,6 @@ internal MessageSender InnerSender
                                 null,
                                 MessagingEntityType.Queue,
                                 this.ServiceBusConnection,
-                                null,
                                 this.CbsTokenProvider,
                                 this.RetryPolicy);
                         }
@@ -265,7 +264,6 @@ internal MessageReceiver InnerReceiver
                                 MessagingEntityType.Queue,
                                 this.ReceiveMode,
                                 this.ServiceBusConnection,
-                                null,
                                 this.CbsTokenProvider,
                                 this.RetryPolicy,
                                 this.PrefetchCount);
@@ -294,7 +292,6 @@ internal SessionClient SessionClient
                                 this.ReceiveMode,
                                 this.PrefetchCount,
                                 this.ServiceBusConnection,
-                                null,
                                 this.CbsTokenProvider,
                                 this.RetryPolicy,
                                 this.RegisteredPlugins);
diff --git a/src/Microsoft.Azure.ServiceBus/SessionClient.cs b/src/Microsoft.Azure.ServiceBus/SessionClient.cs
@@ -89,7 +89,6 @@ public SessionClient(
                   prefetchCount,
                   new ServiceBusConnection(connectionString),
                   null,
-                  null,
                   retryPolicy,
                   null)
         {
@@ -169,7 +168,6 @@ internal SessionClient(
             ReceiveMode receiveMode,
             int prefetchCount,
             ServiceBusConnection serviceBusConnection,
-            ITokenProvider tokenProvider,
             ICbsTokenProvider cbsTokenProvider,
             RetryPolicy retryPolicy,
             IList<ServiceBusPlugin> registeredPlugins)
diff --git a/src/Microsoft.Azure.ServiceBus/SubscriptionClient.cs b/src/Microsoft.Azure.ServiceBus/SubscriptionClient.cs
@@ -269,7 +269,6 @@ internal SessionClient SessionClient
                                 this.ReceiveMode,
                                 this.PrefetchCount,
                                 this.ServiceBusConnection,
-                                null,
                                 this.CbsTokenProvider,
                                 this.RetryPolicy,
                                 this.RegisteredPlugins);
diff --git a/src/Microsoft.Azure.ServiceBus/TopicClient.cs b/src/Microsoft.Azure.ServiceBus/TopicClient.cs
@@ -154,7 +154,6 @@ internal MessageSender InnerSender
                                 null,
                                 MessagingEntityType.Topic,
                                 this.ServiceBusConnection,
-                                null,
                                 this.CbsTokenProvider,
                                 this.RetryPolicy);
                         }
diff --git a/test/Microsoft.Azure.ServiceBus.UnitTests/MessageTests.cs b/test/Microsoft.Azure.ServiceBus.UnitTests/MessageTests.cs
@@ -188,43 +188,5 @@ public async void LargeMessageShouldThrowMessageSizeExceededException()
                 await queueClient.CloseAsync();
             }
         }
-
-        [Theory]
-        [DisplayTestMethodName]
-        [InlineData(null)]
-        [InlineData("123")]
-        [InlineData("jøbber-nå")]
-        public void Should_return_string_representation_of_message(string id)
-        {
-            var message = new Message();
-            if (id != null)
-            {
-                message.MessageId = id;
-            }
-            var result = message.ToString();
-            Assert.Equal($"{{MessageId:{id}}}", result);
-        }
-
-        [Fact]
-        public async void LargeMessageShouldThrowMessageSizeExceededException()
-        {
-            var queueClient = new QueueClient(TestUtility.NamespaceConnectionString, TestConstants.NonPartitionedQueueName, ReceiveMode.PeekLock);
-
-            try
-            {
-                // 2 MB message.
-                var message = new Message(new byte[1024 * 1024 * 2]);
-                await Assert.ThrowsAsync<MessageSizeExceededException>(async () => await queueClient.SendAsync(message));
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-                throw;
-            }
-            finally
-            {
-                await queueClient.CloseAsync();
-            }
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public MessageSession(`
`26`	`26`	`int prefetchCount = Constants.DefaultClientPrefetchCount,`
`27`	`27`	`string sessionId = null,`
`28`	`28`	`bool isSessionReceiver = false)`
`29`		`- : base(entityPath, entityType, receiveMode, serviceBusConnection, null, cbsTokenProvider, retryPolicy, prefetchCount, sessionId, isSessionReceiver)`
	`29`	`+ : base(entityPath, entityType, receiveMode, serviceBusConnection, cbsTokenProvider, retryPolicy, prefetchCount, sessionId, isSessionReceiver)`
`30`	`30`	`{`
`31`	`31`	`this.diagnosticSource = new ServiceBusDiagnosticSource(entityPath, serviceBusConnection.Endpoint);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,6 @@ internal MessageSender InnerSender`
`154`	`154`	`null,`
`155`	`155`	`MessagingEntityType.Topic,`
`156`	`156`	`this.ServiceBusConnection,`
`157`		`- null,`
`158`	`157`	`this.CbsTokenProvider,`
`159`	`158`	`this.RetryPolicy);`
`160`	`159`	`}`