Skip to content

Upgrade common reference #12250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Upgrade common reference #12250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62073be
update reference to common
VeryEarly Jun 24, 2020
9c323c7
upgrade reference in generic provider
VeryEarly Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
Expand All @@ -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)
Expand All @@ -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;

Expand All @@ -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);
Expand Down
32 changes: 16 additions & 16 deletions tools/Common.Netcore.Dependencies.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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"/>
Expand Down