Eg/namespaces

sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj

@@ -4,7 +4,7 @@
     <AssemblyTitle>Microsoft Azure.Messaging.EventGrid client library</AssemblyTitle>
     <Version>4.22.0-beta.1</Version>
     <!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
-    <ApiCompatVersion>4.20.0</ApiCompatVersion>
+    <ApiCompatVersion>4.21.0</ApiCompatVersion>
     <PackageTags>Microsoft Azure EventGrid;Event Grid;Event Grid Publishing;</PackageTags>
     <DisableEnhancedAnalysis>true</DisableEnhancedAnalysis>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>

sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md

@@ -4,11 +4,7 @@ Run `dotnet build /t:GenerateCode` to generate code.
 
 ``` yaml
 title: EventGridClient
-<<<<<<< HEAD
-require: https://github.com/Azure/azure-rest-api-specs/blob/b9263dee21632c97c9b54e151a40592d9bf97cbb/specification/eventgrid/data-plane/readme.md
-=======
 require: https://github.com/Azure/azure-rest-api-specs/blob/11bbc2b1df2e915a2227a6a1a48a27b9e67c3311/specification/eventgrid/data-plane/readme.md
->>>>>>> 1919e61581d0a8bd946ae3693735c0df0c779e87
 generation1-convenience-client: true
 model-factory-for-hlc:
 - MediaJobOutputAsset

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj

@@ -3,10 +3,10 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <Description>Microsoft Azure WebJobs SDK ServiceBus Extension</Description>
-    <Version>5.13.4</Version>
+    <Version>5.14.0-beta.1</Version>
     <!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
     <!--Since we are adding a new target for net6.0, we need to temporarily condition on netstandard-->
-    <ApiCompatVersion>5.13.3</ApiCompatVersion>
+    <ApiCompatVersion>5.13.4</ApiCompatVersion>
     <NoWarn>$(NoWarn);AZC0001;CS1591;SA1636;AZC0007;AZC0015</NoWarn>
     <SignAssembly>true</SignAssembly>
     <IsExtensionClientLibrary>true</IsExtensionClientLibrary>