diff --git a/eng/CodeGeneration.targets b/eng/CodeGeneration.targets
index 2423c7250767..d0b2857a979f 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.6236/autorest-3.0.6236.tgz</_AutoRestVersion>
     <_AutoRestCoreVersion>3.0.6306</_AutoRestCoreVersion>
-    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200909.1/autorest-csharp-v3-3.0.0-dev.20200909.1.tgz</_AutoRestCSharpVersion>
+    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200911.1/autorest-csharp-v3-3.0.0-dev.20200911.1.tgz</_AutoRestCSharpVersion>
     <_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
     <_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
     <AutoRestInput Condition="'$(AutoRestInput)' == ''">$(_DefaultInputName)</AutoRestInput>
@@ -60,3 +60,4 @@
 
 
 
+
diff --git a/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs
index d276ab0e998c..c77b4b72ef7b 100644
--- a/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs
@@ -166,7 +166,7 @@ public void AppendRawNextLink(string nextLink, bool escape)
                 return;
             }
 
-            AppendPath(nextLink, escape);
+            AppendRaw(nextLink, escape);
         }
     }
 }
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs
index 1cfd1fe44142..907f13402359 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs
@@ -992,7 +992,7 @@ internal HttpMessage CreateListNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs
index 310569c83d25..0d7024792954 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs
@@ -255,7 +255,7 @@ internal HttpMessage CreateListNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs
index 42d7550cb638..4e1dab135c0d 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs
@@ -930,7 +930,7 @@ internal HttpMessage CreateListNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
@@ -1001,7 +1001,7 @@ internal HttpMessage CreateGetGroupMembersNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs
index 5ab14ec6586e..7b1cab874588 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs
@@ -248,7 +248,7 @@ internal HttpMessage CreateListNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs
index 3624961de15d..dc71fe9bf902 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs
@@ -134,7 +134,7 @@ internal HttpMessage CreateGetObjectsByObjectIdsNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs
index 5ca6146266a7..545ea4b40421 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs
@@ -771,7 +771,7 @@ internal HttpMessage CreateListNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs
index 4e918c8c7158..49ce61ad2961 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs
@@ -172,7 +172,7 @@ internal HttpMessage CreateListOwnedObjectsNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs
index 98c545c1124a..ef05724dc846 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs
@@ -489,7 +489,7 @@ internal HttpMessage CreateListNextRequest(string nextLink)
             uri.AppendPath("/", false);
             uri.AppendPath(tenantID, true);
             uri.AppendPath("/", false);
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRawNextLink(nextLink, false);
             uri.AppendQuery("api-version", apiVersion, true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json, text/json");