Skip to content

HPF PR: vmss <- huangpf:vmss #204

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.

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 30 commits into from
Apr 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0e49d36
Adding US Government Connection
zakramer Mar 25, 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
cd2af51
Fixed parameter name in Add-AzureRemoteAppUser examples
zaevans Mar 31, 2016
44f42f5
Update Key Vault CmdLets' help file
pomortaz Apr 1, 2016
630abe1
Add Profile DLL reference
huangpf Apr 3, 2016
c544dbd
Merge pull request #2044 from pomortaz/dev
Apr 4, 2016
fff08bf
Merge pull request #2040 from zaevans/zaevansDev
Apr 4, 2016
b75e957
Merge pull request #2018 from zakramer/AzureGovConnection
Apr 4, 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
b09f30d
Merge pull request #2057 from Azure/Compute.1.2.6-hotfix
Apr 6, 2016
be186b5
Merge pull request #2058 from Azure/master
Apr 6, 2016
0964c6d
Updating help XML for ADLS
matt1883 Apr 8, 2016
deadac2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
huangpf Apr 8, 2016
032951c
Merge pull request #2070 from matt1883/patch-1
Apr 8, 2016
d99830b
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
huangpf Apr 8, 2016
c6daea5
Update Libs
huangpf Apr 8, 2016
8010f46
Disable Local Build Check
huangpf Apr 8, 2016
445f725
Update
huangpf Apr 9, 2016
26812ed
Update
huangpf Apr 14, 2016
da5e60d
Update
huangpf Apr 15, 2016
48bf63e
Update
huangpf Apr 21, 2016
0b8e718
Update
huangpf Apr 21, 2016
c4c2e63
Update
huangpf Apr 21, 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
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ For detail descriptions and examples of the cmdlets, type
* [Azure Stack](https://azure.microsoft.com/en-us/overview/azure-stack/)
* [Windows Azure Pack](https://www.microsoft.com/en-us/server-cloud/windows-azure-pack.aspx)
* [Microsoft Azure China](https://www.azure.cn/)
* [USGovernment](https://azure.microsoft.com/en-us/features/gov/)
* [Microsoft Azure US Government](https://azure.microsoft.com/en-us/features/gov/)

## Installation

Expand Down Expand Up @@ -123,6 +123,15 @@ Add-AzureRmAccount -EnvironmentName AzureChinaCloud
New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
```

### Microsoft Azure US Government

```powershell
Add-AzureRmAccount -EnvironmentName AzureUSGovernment

# use the cmdlets to manage your services/applications
New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
```

### Windows Azure Pack

```powershell
Expand Down
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
<!-- Run Dependecy Analyzer -->
<Target Name="DependencyAnalysis">
<Message Importance="high" Text="Running Dependency Analysis..." />
<Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package"/>
<!-- <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package"/> -->
</Target>

<!-- Publish all packages -->
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/AzureRM.Compute.psd1
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<Reference Include="Microsoft.Azure.Management.Authorization">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Compute, Version=13.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down 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
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)]
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");
}

}
}

Large diffs are not rendered by default.

Loading