From 2f304c4ccad25f09c5c7ecfe91550bcc77fa143d Mon Sep 17 00:00:00 2001
From: Alexey Rodionov <alrod@microsoft.com>
Date: Thu, 10 Oct 2019 19:00:15 -0700
Subject: [PATCH] Updating to Microsoft.Azure.ServiceBus 4.0.0 (#26)

---
 Message.xml                                                  | 5 +++++
 Properties.xml                                               | 5 +++++
 .../WebJobs.Extensions.ServiceBus.csproj                     | 4 ++--
 .../ServiceBusEndToEndTests.cs                               | 2 ++
 .../WebJobs.Extensions.ServiceBus.Tests.csproj               | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 Message.xml
 create mode 100644 Properties.xml

diff --git a/Message.xml b/Message.xml
new file mode 100644
index 000000000..93089806a
--- /dev/null
+++ b/Message.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<Message xmlns="http://schemas.microsoft.com/servicebusexplorer">
+  <Date>Friday, October 4, 2019 10:14:45 PM</Date>
+  <Content><![CDATA[<message>Hi mate, how are you?</message>]]></Content>
+</Message>
\ No newline at end of file
diff --git a/Properties.xml b/Properties.xml
new file mode 100644
index 000000000..c5267899c
--- /dev/null
+++ b/Properties.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<Properties xmlns="http://schemas.microsoft.com/servicebusexplorer">
+  <Property Key="MachineName" Type="String" Value="ALROD-P51" />
+  <Property Key="UserName" Type="String" Value="alrod" />
+</Properties>
\ No newline at end of file
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus/WebJobs.Extensions.ServiceBus.csproj b/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus/WebJobs.Extensions.ServiceBus.csproj
index 07c82fa18..be38881fa 100644
--- a/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus/WebJobs.Extensions.ServiceBus.csproj
+++ b/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus/WebJobs.Extensions.ServiceBus.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Microsoft.Azure.WebJobs.ServiceBus</RootNamespace>
     <PackageId>Microsoft.Azure.WebJobs.Extensions.ServiceBus</PackageId>
     <Description>Microsoft Azure WebJobs SDK ServiceBus Extension</Description>
-    <Version>3.1.1</Version>
+    <Version>4.0.0</Version>
     <CommitHash Condition="$(CommitHash) == ''">N/A</CommitHash>
     <InformationalVersion>$(Version) Commit hash: $(CommitHash)</InformationalVersion>
     <Authors>Microsoft</Authors>
@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.4.0" />
+    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.0.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.10" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Sources" Version="3.0.10" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/ServiceBusEndToEndTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/ServiceBusEndToEndTests.cs
index 17544e89c..ba67a8d86 100644
--- a/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/ServiceBusEndToEndTests.cs
+++ b/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/ServiceBusEndToEndTests.cs
@@ -235,6 +235,8 @@ private async Task ServiceBusEndToEndInternal<T>(IHost host = null)
                 string[] consoleOutputLines = consoleOutput
                     .Where(p => p.FormattedMessage != null)
                     .SelectMany(p => p.FormattedMessage.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries))
+                    // There is a known issue in SB SDK 4.0.0 in MessageReceivePump.MessagePumpTaskAsync https://github.com/Azure/azure-sdk-for-net/issues/6410
+                    .Where(p => !p.StartsWith("Message processing error"))
                     .OrderBy(p => p)
                     .ToArray();
 
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/WebJobs.Extensions.ServiceBus.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/WebJobs.Extensions.ServiceBus.Tests.csproj
index 7c2387e67..68ca7213d 100644
--- a/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/WebJobs.Extensions.ServiceBus.Tests.csproj
+++ b/test/Microsoft.Azure.WebJobs.Extensions.ServiceBus.Tests/WebJobs.Extensions.ServiceBus.Tests.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.4.0" />
+    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.0.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.TestCommon" Version="3.0.10" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
       <PrivateAssets>all</PrivateAssets>