From 62073be7a8c82b897d2db9ee3d340be526e67add Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Wed, 24 Jun 2020 12:16:46 +0800 Subject: [PATCH 1/2] update reference to common --- tools/Common.Netcore.Dependencies.targets | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets index 897bf50d9e77..d253192e65a8 100644 --- a/tools/Common.Netcore.Dependencies.targets +++ b/tools/Common.Netcore.Dependencies.targets @@ -3,21 +3,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + From 9c323c72122a86a336ab2a936c500f5aaeff9173 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Wed, 24 Jun 2020 13:25:19 +0800 Subject: [PATCH 2/2] upgrade reference in generic provider --- .../GenericProvider.cs | 20 +++++++++---------- tools/Common.Netcore.Dependencies.targets | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs b/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs index c9d6c01768d7..37b9c4bb8414 100644 --- 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(url, _configuration.ApiVersion); + PrivateEndpointConnection connnection = ServiceClient.Operations.GetResource(url, _configuration.ApiVersion); return ToPsPrivateEndpointConnection(connnection); } @@ -74,7 +74,7 @@ public List ListPrivateEndpointConnections(string r if(_configuration.HasConnectionsURI) { string url = BuildPrivateEndpointConnectionsURL(resourceGroupName, serviceName); - IPage list = ServiceClient.Operations.GetResoucePage, PrivateEndpointConnection>(url, _configuration.ApiVersion); + IPage list = ServiceClient.Operations.GetResourcePage, PrivateEndpointConnection>(url, _configuration.ApiVersion); foreach (var pec in list) { var psPec = ToPsPrivateEndpointConnection(pec); @@ -82,7 +82,7 @@ public List ListPrivateEndpointConnections(string r } while (list.NextPageLink != null) { - list = ServiceClient.Operations.GetResoucePage, PrivateEndpointConnection>(list.NextPageLink, null); + list = ServiceClient.Operations.GetResourcePage, PrivateEndpointConnection>(list.NextPageLink, null); foreach (var pec in list) { var psPec = ToPsPrivateEndpointConnection(pec); @@ -93,7 +93,7 @@ public List ListPrivateEndpointConnections(string r else { string url = BuildPrivateEndpointConnectionsOwnerURL(resourceGroupName, serviceName); - TrackedResource resource = ServiceClient.Operations.GetResouce(url, _configuration.ApiVersion); + TrackedResource resource = ServiceClient.Operations.GetResource(url, _configuration.ApiVersion); if(resource?.PrivateEndpointConnections != null) { foreach (var pec in resource.PrivateEndpointConnections) @@ -110,7 +110,7 @@ public List 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(url, _configuration.ApiVersion); + PrivateEndpointConnection privateEndpointConnection = ServiceClient.Operations.GetResource(url, _configuration.ApiVersion); privateEndpointConnection.PrivateLinkServiceConnectionState.Status = status; @@ -119,7 +119,7 @@ public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string privateEndpointConnection.PrivateLinkServiceConnectionState.Description = description; } - ServiceClient.Operations.PutResouce(url, _configuration.ApiVersion, privateEndpointConnection); + ServiceClient.Operations.PutResource(url, _configuration.ApiVersion, privateEndpointConnection); return GetPrivateEndpointConnection(resourceGroupName, serviceName, name); } @@ -127,13 +127,13 @@ public PSPrivateEndpointConnection UpdatePrivateEndpointConnectionStatus(string 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(url, _configuration.ApiVersion); + PrivateLinkResource resource = ServiceClient.Operations.GetResource(url, _configuration.ApiVersion); return ToPsPrivateLinkResource(resource); } @@ -141,7 +141,7 @@ public List ListPrivateLinkResource(string resourceGroupN { var psPLRs = new List(); string url = BuildPrivateLinkResourcesURL(resourceGroupName, serviceName); - IPage list = ServiceClient.Operations.GetResoucePage, PrivateLinkResource>(url, _configuration.ApiVersion); + IPage list = ServiceClient.Operations.GetResourcePage, PrivateLinkResource>(url, _configuration.ApiVersion); foreach (var plr in list) { var psPlr = ToPsPrivateLinkResource(plr); @@ -149,7 +149,7 @@ public List ListPrivateLinkResource(string resourceGroupN } while (list.NextPageLink != null) { - list = ServiceClient.Operations.GetResoucePage, PrivateLinkResource>(list.NextPageLink, null); + list = ServiceClient.Operations.GetResourcePage, 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 index d253192e65a8..9d8c34bdf514 100644 --- a/tools/Common.Netcore.Dependencies.targets +++ b/tools/Common.Netcore.Dependencies.targets @@ -32,7 +32,7 @@ - $(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.16-preview\tools\ + $(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.17-preview\tools\