Skip to content

Commit 868b861

Browse files
committed
Workspace object usage coded
1 parent 3d1a7ef commit 868b861

File tree

7 files changed

+9
-15
lines changed

7 files changed

+9
-15
lines changed

src/ResourceManager/Network/AzureRM.Network.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CLRVersion = '4.0'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.0.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.Network.dll', '.\Microsoft.Azure.Management.OperationalInsights.dll'
57+
RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.Network.dll'
5858

5959
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6060
# ScriptsToProcess = @()

src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@
6060
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.1-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
65-
</Reference>
66-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
67-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
68-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
6963
</ItemGroup>
7064
<ItemGroup>
7165
<Compile Include="ApplicationGateway\ApplicationGatewayBaseCmdlet.cs" />
@@ -586,6 +580,10 @@
586580
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
587581
<Name>Commands.ResourceManager.Common</Name>
588582
</ProjectReference>
583+
<ProjectReference Include="..\..\OperationalInsights\Commands.OperationalInsights\Commands.OperationalInsights.csproj">
584+
<Project>{5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}</Project>
585+
<Name>Commands.ResourceManager.OperationalInsights</Name>
586+
</ProjectReference>
589587
</ItemGroup>
590588
<ItemGroup>
591589
<Folder Include="Microsoft\Azure\Commands\Network\Models\" />

src/ResourceManager/Network/Commands.Network/NetworkWatcher/SetAzureNetworkWatcherConfigFlowLogCommand.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Net;
2121
using System.Management.Automation;
2222
using MNM = Microsoft.Azure.Management.Network.Models;
23-
using Microsoft.Azure.Management.OperationalInsights;
23+
using MOM = Microsoft.Azure.Commands.OperationalInsights.Models;
2424

2525
namespace Microsoft.Azure.Commands.Network
2626
{
@@ -207,7 +207,7 @@ public class SetAzureNetworkWatcherConfigFlowLogCommand : NetworkWatcherBaseCmdl
207207
HelpMessage = "The WS object which is used to store the traffic analytics data.",
208208
ParameterSetName = SetByNameWithTAByResource)]
209209
[ValidateNotNull]
210-
public Microsoft.Azure.Management.OperationalInsights.Models.Workspace Workspace { get; set; }
210+
public MOM.PSWorkspace Workspace { get; set; }
211211

212212
public override void Execute()
213213
{
@@ -281,8 +281,8 @@ public override void Execute()
281281
throw new System.ArgumentException("Either the Workspace parameter or all of WorkspaceResourceId,WorkspaceGUId,WorkspaceLocation must be provided");
282282
}
283283

284-
WorkspaceResourceId = this.Workspace.Id;
285-
WorkspaceGUId = this.Workspace.CustomerId;
284+
WorkspaceResourceId = this.Workspace.ResourceId;
285+
WorkspaceGUId = this.Workspace.CustomerId.ToString();
286286
WorkspaceLocation = this.Workspace.Location;
287287

288288
}

src/ResourceManager/Network/Commands.Network/packages.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Management.Network" version="19.0.1-preview" targetFramework="net452" />
6-
<package id="Microsoft.Azure.Management.OperationalInsights" version="0.18.0-preview" targetFramework="net452" />
7-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.11" targetFramework="net452" />
8-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.12" targetFramework="net452" />
9-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
106
</packages>

src/StackAdmin/AzureRM/AzureRM.psm1

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/AzureRM/AzureRM.psm1

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)