Skip to content

Commit 8519c18

Browse files
author
Hovsep
committed
Merge pull request #2101 from hyonholee/dev3
[Release.1.3.2-rc2] [AzureRT]
2 parents 0368bf2 + 25f6b22 commit 8519c18

15 files changed

+21423
-25889
lines changed

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<Reference Include="Microsoft.Azure.Management.Authorization">
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
66+
<Reference Include="Microsoft.Azure.Management.Compute">
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Compute" version="12.0.1-prerelease" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Compute" version="13.0.0-prerelease" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Network" version="4.2.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
79-
<Reference Include="Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
79+
<Reference Include="Microsoft.Azure.Management.Compute">
80+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/Compute/Commands.Compute/Generated/InvokeAzureComputeMethodCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
namespace Microsoft.Azure.Commands.Compute.Automation
3232
{
33-
[Cmdlet(VerbsLifecycle.Invoke, "AzureComputeMethod", DefaultParameterSetName = "InvokeByDynamicParameters")]
33+
//[Cmdlet(VerbsLifecycle.Invoke, "AzureComputeMethod", DefaultParameterSetName = "InvokeByDynamicParameters")]
3434
[OutputType(typeof(object))]
3535
public partial class InvokeAzureComputeMethodCmdlet : ComputeAutomationBaseCmdlet, IDynamicParameters
3636
{

src/ResourceManager/Compute/Commands.Compute/Generated/Microsoft.Azure.Commands.Compute.Automation.format.generated.ps1xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@
134134
</ListControl>
135135
</View>
136136
<View>
137-
<Name>Microsoft.Rest.Azure.IPage`1[[Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSet, Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</Name>
137+
<Name>Microsoft.Rest.Azure.IPage`1[[Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSet, Microsoft.Azure.Management.Compute, Version=13.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</Name>
138138
<ViewSelectedBy>
139-
<TypeName>Microsoft.Rest.Azure.IPage`1[[Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSet, Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</TypeName>
139+
<TypeName>Microsoft.Rest.Azure.IPage`1[[Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSet, Microsoft.Azure.Management.Compute, Version=13.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]]</TypeName>
140140
</ViewSelectedBy>
141141
<ListControl>
142142
<ListEntries>

src/ResourceManager/Compute/Commands.Compute/Generated/NewAzureComputeArgumentListCmdlet.cs

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)