Skip to content

Compute.1.2.6 hotfix #2057

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
hovsepm merged 10 commits into from
Apr 6, 2016
Merged

Compute.1.2.6 hotfix #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86d716b
Fix ServiceManagement tests
hyonholee Mar 29, 2016
e2532e4
Merge branch 'vmss2' of https://github.com/hyonholee/azure-powershell…
hyonholee Mar 30, 2016
af86449
Fix New-AzureVmssIpConfig issue.
hyonholee Mar 30, 2016
5daff94
Add VMSS load balancer test
hyonholee Mar 31, 2016
0edcfa4
Fix Export and Import AzureVM issue
hyonholee Mar 31, 2016
539ae60
Fix Remove-AzureAvailabilitySet issue
hyonholee Mar 31, 2016
01e4cac
Merge branch 'Compute.1.2.6-hotfix' of github.com:Azure/azure-powersh…
Apr 5, 2016
7226976
Merge pull request #2053 from hovsepm/Compute.1.2.6
Apr 5, 2016
7f2fe7c
Bumping up Compute module versions.
Apr 5, 2016
d39065d
Merge pull request #2055 from hovsepm/Compute.1.2.6
Apr 5, 2016
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
2 changes: 1 addition & 1 deletion src/AzureRT.testsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Description>These are test settings for AzureRT test run.</Description>
<Deployment>
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\Resources\" />
<DeploymentItem filename="Package\Debug\" />
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\" />
</Deployment>
<Execution parallelTestCount="0">
<Timeouts testTimeout="3000000" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager.ForRefactoringOnly.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Reso
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/AzureRM.Compute.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.2.5'
ModuleVersion = '1.2.6'

# ID used to uniquely identify this module
GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37'
Expand Down
3 changes: 3 additions & 0 deletions src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineScaleSetTests\TestVirtualMachineScaleSet.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineScaleSetTests\TestVirtualMachineScaleSetLB.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineScaleSetTests\TestVirtualMachineScaleSetReimageUpdate.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute.Test/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@

[assembly: Guid("28fe3fc0-6fdf-4f01-8a82-d7b4a834ddd2")]

[assembly: AssemblyVersion("1.2.5")]
[assembly: AssemblyFileVersion("1.2.5")]
[assembly: AssemblyVersion("1.2.6")]
[assembly: AssemblyFileVersion("1.2.6")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
8 changes: 8 additions & 0 deletions ...esourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,13 @@ public void TestVirtualMachineScaleSetReimageUpdate()
{
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineScaleSetReimageUpdate");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachineScaleSetLB()
{
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineScaleSetLB");
}

}
}
383 changes: 253 additions & 130 deletions ...sourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1
View file
Open in desktop

Large diffs are not rendered by default.

Loading