diff --git a/eng/CodeGeneration.targets b/eng/CodeGeneration.targets
index 09aeeb4b63b6..f1f99319c696 100644
--- a/eng/CodeGeneration.targets
+++ b/eng/CodeGeneration.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6222/autorest-3.0.6222.tgz</_AutoRestVersion>
     <_AutoRestCoreVersion>3.0.6282</_AutoRestCoreVersion>
-    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200516.1/autorest-csharp-v3-3.0.0-dev.20200516.1.tgz</_AutoRestCSharpVersion>
+    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200518.1/autorest-csharp-v3-3.0.0-dev.20200518.1.tgz</_AutoRestCSharpVersion>
     <_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
     <_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
     <AutoRestInput Condition="'$(AutoRestInput)' == ''">$(_DefaultInputName)</AutoRestInput>
@@ -45,3 +45,4 @@
 
 
 
+
diff --git a/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{T,THeaders}.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{T,THeaders}.cs
index 5c2036521e2a..b8f16f46234c 100644
--- a/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{T,THeaders}.cs
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{T,THeaders}.cs
@@ -21,5 +21,7 @@ public ResponseWithHeaders(T value, THeaders headers, Response rawResponse)
         public override T Value { get; }
 
         public THeaders Headers { get; }
+
+        public static implicit operator Response(ResponseWithHeaders<T, THeaders> self) => self.GetRawResponse();
     }
 }
diff --git a/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{THeaders}.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{THeaders}.cs
index c761a2ca5bab..d2c105aea021 100644
--- a/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{THeaders}.cs
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{THeaders}.cs
@@ -19,6 +19,6 @@ public ResponseWithHeaders(THeaders headers, Response rawResponse)
 
         public THeaders Headers { get; }
 
-        public static implicit  operator Response(ResponseWithHeaders<THeaders> responseWithHeaders) => responseWithHeaders.GetRawResponse();
+        public static implicit operator Response(ResponseWithHeaders<THeaders> self) => self.GetRawResponse();
     }
 }