Upgrade common reference (#12250)

VeryEarly · web-flow · commit bb5cf7e1df5c · 2020-06-24T15:10:27.000+08:00
* update reference to common

* upgrade reference in generic provider
diff --git a/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs b/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs
@@ -64,7 +64,7 @@ private IAzureRestClient ServiceClient
         public PSPrivateEndpointConnection GetPrivateEndpointConnection(string resourceGroupName, string serviceName, string name)
         {
             string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);
-            PrivateEndpointConnection connnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);
+            PrivateEndpointConnection connnection = ServiceClient.Operations.GetResource<PrivateEndpointConnection>(url, _configuration.ApiVersion);
             return ToPsPrivateEndpointConnection(connnection);
         }
 
@@ -74,15 +74,15 @@ public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string r
             if(_configuration.HasConnectionsURI)
             {
                 string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName);
-                IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _configuration.ApiVersion);
+                IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResourcePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _configuration.ApiVersion);
                 foreach (var pec in list)
                 {
                     var psPec = ToPsPrivateEndpointConnection(pec);
                     psPECs.Add(psPec);
                 }
                 while (list.NextPageLink != null)
                 {
-                    list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);
+                    list = ServiceClient.Operations.GetResourcePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);
                     foreach (var pec in list)
                     {
                         var psPec = ToPsPrivateEndpointConnection(pec);
@@ -93,7 +93,7 @@ public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string r
             else
             {
                 string url = BuildPrivateEndpointConnectionsOwnerURL(resourceGroupName, serviceName);
-                TrackedResource resource = ServiceClient.Operations.GetResouce<TrackedResource>(url, _configuration.ApiVersion);
+                TrackedResource resource = ServiceClient.Operations.GetResource<TrackedResource>(url, _configuration.ApiVersion);
                 if(resource?.PrivateEndpointConnections != null)
                 {
                     foreach (var pec in resource.PrivateEndpointConnections)
@@ -110,7 +110,7 @@ public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string r
         public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string resourceGroupName, string serviceName, string name, string status, string description = null)
         {
             string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);
-            PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);
+            PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResource<PrivateEndpointConnection>(url, _configuration.ApiVersion);
 
             privateEndpointConnection.PrivateLinkServiceConnectionState.Status = status;
 
@@ -119,37 +119,37 @@ public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string
                 privateEndpointConnection.PrivateLinkServiceConnectionState.Description = description;
             }
 
-            ServiceClient.Operations.PutResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion, privateEndpointConnection);
+            ServiceClient.Operations.PutResource<PrivateEndpointConnection>(url, _configuration.ApiVersion, privateEndpointConnection);
 
             return GetPrivateEndpointConnection(resourceGroupName, serviceName, name);
         }
 
         public void DeletePrivateEndpointConnection(string resourceGroupName, string serviceName, string name)
         {
             string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);
-            ServiceClient.Operations.DeleteResouce(url, _configuration.ApiVersion);
+            ServiceClient.Operations.DeleteResource(url, _configuration.ApiVersion);
         }
 
         public PSPrivateLinkResource GetPrivateLinkResource(string resourceGroupName, string serviceName, string name)
         {
             string url = BuildPrivateLinkResourceURL(resourceGroupName, serviceName, name);
-            PrivateLinkResource resource = ServiceClient.Operations.GetResouce<PrivateLinkResource>(url, _configuration.ApiVersion);
+            PrivateLinkResource resource = ServiceClient.Operations.GetResource<PrivateLinkResource>(url, _configuration.ApiVersion);
             return ToPsPrivateLinkResource(resource);
         }
 
         public List<PSPrivateLinkResource> ListPrivateLinkResource(string resourceGroupName, string serviceName)
         {
             var psPLRs = new List<PSPrivateLinkResource>();
             string url = BuildPrivateLinkResourcesURL(resourceGroupName, serviceName);
-            IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _configuration.ApiVersion);
+            IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResourcePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _configuration.ApiVersion);
             foreach (var plr in list)
             {
                 var psPlr = ToPsPrivateLinkResource(plr);
                 psPLRs.Add(psPlr);
             }
             while (list.NextPageLink != null)
             {
-                list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(list.NextPageLink, null);
+                list = ServiceClient.Operations.GetResourcePage<Page<PrivateLinkResource>, PrivateLinkResource>(list.NextPageLink, null);
                 foreach (var plr in list)
                 {
                     var psPlr = ToPsPrivateLinkResource(plr);
diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets
@@ -3,21 +3,21 @@
   <ItemGroup > 
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.20"/>
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.16-preview"/>
-    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.16-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.17-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.17-preview"/>
   </ItemGroup>
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0">
@@ -32,7 +32,7 @@
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup>
-    <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.16-preview\tools\</StorageToolsPath>
+    <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.17-preview\tools\</StorageToolsPath>
   </PropertyGroup>
   <ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private IAzureRestClient ServiceClient`
`64`	`64`	`public PSPrivateEndpointConnection GetPrivateEndpointConnection(string resourceGroupName, string serviceName, string name)`
`65`	`65`	`{`
`66`	`66`	`string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);`
`67`		`- PrivateEndpointConnection connnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);`
	`67`	`+ PrivateEndpointConnection connnection = ServiceClient.Operations.GetResource<PrivateEndpointConnection>(url, _configuration.ApiVersion);`
`68`	`68`	`return ToPsPrivateEndpointConnection(connnection);`
`69`	`69`	`}`
`70`	`70`
`@@ -74,15 +74,15 @@ public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string r`
`74`	`74`	`if(_configuration.HasConnectionsURI)`
`75`	`75`	`{`
`76`	`76`	`string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName);`
`77`		`- IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _configuration.ApiVersion);`
	`77`	`+ IPage<PrivateEndpointConnection> list = ServiceClient.Operations.GetResourcePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(url, _configuration.ApiVersion);`
`78`	`78`	`foreach (var pec in list)`
`79`	`79`	`{`
`80`	`80`	`var psPec = ToPsPrivateEndpointConnection(pec);`
`81`	`81`	`psPECs.Add(psPec);`
`82`	`82`	`}`
`83`	`83`	`while (list.NextPageLink != null)`
`84`	`84`	`{`
`85`		`- list = ServiceClient.Operations.GetResoucePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);`
	`85`	`+ list = ServiceClient.Operations.GetResourcePage<Page<PrivateEndpointConnection>, PrivateEndpointConnection>(list.NextPageLink, null);`
`86`	`86`	`foreach (var pec in list)`
`87`	`87`	`{`
`88`	`88`	`var psPec = ToPsPrivateEndpointConnection(pec);`
`@@ -93,7 +93,7 @@ public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string r`
`93`	`93`	`else`
`94`	`94`	`{`
`95`	`95`	`string url = BuildPrivateEndpointConnectionsOwnerURL(resourceGroupName, serviceName);`
`96`		`- TrackedResource resource = ServiceClient.Operations.GetResouce<TrackedResource>(url, _configuration.ApiVersion);`
	`96`	`+ TrackedResource resource = ServiceClient.Operations.GetResource<TrackedResource>(url, _configuration.ApiVersion);`
`97`	`97`	`if(resource?.PrivateEndpointConnections != null)`
`98`	`98`	`{`
`99`	`99`	`foreach (var pec in resource.PrivateEndpointConnections)`
`@@ -110,7 +110,7 @@ public List<PSPrivateEndpointConnection> ListPrivateEndpointConnections(string r`
`110`	`110`	`public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string resourceGroupName, string serviceName, string name, string status, string description = null)`
`111`	`111`	`{`
`112`	`112`	`string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);`
`113`		`- PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion);`
	`113`	`+ PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResource<PrivateEndpointConnection>(url, _configuration.ApiVersion);`
`114`	`114`
`115`	`115`	`privateEndpointConnection.PrivateLinkServiceConnectionState.Status = status;`
`116`	`116`
`@@ -119,37 +119,37 @@ public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string`
`119`	`119`	`privateEndpointConnection.PrivateLinkServiceConnectionState.Description = description;`
`120`	`120`	`}`
`121`	`121`
`122`		`- ServiceClient.Operations.PutResouce<PrivateEndpointConnection>(url, _configuration.ApiVersion, privateEndpointConnection);`
	`122`	`+ ServiceClient.Operations.PutResource<PrivateEndpointConnection>(url, _configuration.ApiVersion, privateEndpointConnection);`
`123`	`123`
`124`	`124`	`return GetPrivateEndpointConnection(resourceGroupName, serviceName, name);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public void DeletePrivateEndpointConnection(string resourceGroupName, string serviceName, string name)`
`128`	`128`	`{`
`129`	`129`	`string url = BuildPrivateEndpointConnectionURL(resourceGroupName, serviceName, name);`
`130`		`- ServiceClient.Operations.DeleteResouce(url, _configuration.ApiVersion);`
	`130`	`+ ServiceClient.Operations.DeleteResource(url, _configuration.ApiVersion);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`public PSPrivateLinkResource GetPrivateLinkResource(string resourceGroupName, string serviceName, string name)`
`134`	`134`	`{`
`135`	`135`	`string url = BuildPrivateLinkResourceURL(resourceGroupName, serviceName, name);`
`136`		`- PrivateLinkResource resource = ServiceClient.Operations.GetResouce<PrivateLinkResource>(url, _configuration.ApiVersion);`
	`136`	`+ PrivateLinkResource resource = ServiceClient.Operations.GetResource<PrivateLinkResource>(url, _configuration.ApiVersion);`
`137`	`137`	`return ToPsPrivateLinkResource(resource);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public List<PSPrivateLinkResource> ListPrivateLinkResource(string resourceGroupName, string serviceName)`
`141`	`141`	`{`
`142`	`142`	`var psPLRs = new List<PSPrivateLinkResource>();`
`143`	`143`	`string url = BuildPrivateLinkResourcesURL(resourceGroupName, serviceName);`
`144`		`- IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _configuration.ApiVersion);`
	`144`	`+ IPage<PrivateLinkResource> list = ServiceClient.Operations.GetResourcePage<Page<PrivateLinkResource>, PrivateLinkResource>(url, _configuration.ApiVersion);`
`145`	`145`	`foreach (var plr in list)`
`146`	`146`	`{`
`147`	`147`	`var psPlr = ToPsPrivateLinkResource(plr);`
`148`	`148`	`psPLRs.Add(psPlr);`
`149`	`149`	`}`
`150`	`150`	`while (list.NextPageLink != null)`
`151`	`151`	`{`
`152`		`- list = ServiceClient.Operations.GetResoucePage<Page<PrivateLinkResource>, PrivateLinkResource>(list.NextPageLink, null);`
	`152`	`+ list = ServiceClient.Operations.GetResourcePage<Page<PrivateLinkResource>, PrivateLinkResource>(list.NextPageLink, null);`
`153`	`153`	`foreach (var plr in list)`
`154`	`154`	`{`
`155`	`155`	`var psPlr = ToPsPrivateLinkResource(plr);`