Skip to content

Vmss #165

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 60 commits into from
Mar 4, 2016
Merged

Vmss #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
981c2c4
Initial changes for PowerShell to use AutoRest SDK
Jan 12, 2016
779047c
Initial check-in of DataLake AutoRest changes
Jan 19, 2016
a223f4c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jan 28, 2016
98c1e42
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jan 28, 2016
cde72d8
Adding some more private versions of packages
Jan 28, 2016
03238a4
Regenerate the wxi file.
Jan 29, 2016
f893dcd
Update the uploader to not require latest ClientRuntime
Feb 1, 2016
bcec8b9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 22, 2016
5a7a763
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 23, 2016
223b044
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 24, 2016
a7bc077
PowerShell ADL updates for AutoRest
Feb 24, 2016
5e86781
FW: Clean the cmdlets code, add a deprecation warning to some of the …
gucalder Feb 24, 2016
aba8d9b
FW: Changing the deprecation message and removing the verbose messages
gucalder Feb 25, 2016
631ff81
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
gucalder Feb 25, 2016
36ad588
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
gucalder Feb 25, 2016
9d56b08
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
gucalder Feb 25, 2016
2440b1e
Removing local feed and updating ADL cmdlets
Feb 25, 2016
fb01622
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 25, 2016
7149b90
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
gucalder Feb 25, 2016
f517c36
Adding the new AdlArmClient logic that is in the interface.
Feb 25, 2016
e180462
FW: Changed wxi file
gucalder Feb 26, 2016
fe86049
Address Mark's comments
Feb 26, 2016
ab06a95
Add filesystem tests
Feb 26, 2016
44cb9a1
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 26, 2016
2837db2
Update tests for ADLA
Feb 26, 2016
4382700
FW: Remove the wxi changes and add again all references
gucalder Feb 26, 2016
90c25f7
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 26, 2016
5001735
Missed two changes in the merge
Feb 26, 2016
1d500f7
Update ChangeLog.md
Feb 26, 2016
608ff09
Update azurecmd.wxs
Feb 26, 2016
2e5b7b2
bumped up AzureRm version to 1.2.2
Feb 26, 2016
630284f
Remove web.* dlls from wxi
Feb 26, 2016
3a19bb7
bumped up ARM modules version
Feb 26, 2016
06ba302
sync assemblyinfo for ASM modules
Feb 26, 2016
5752f02
sync azurerm.psm1 versions
Feb 26, 2016
fb394f3
Merge branch 'release-1.2.2' of https://github.com/Azure/azure-powers…
Feb 26, 2016
0c080bd
Address Hovsep comments.
Feb 26, 2016
ecd90cc
FW: Implement PR comments from SDK team
gucalder Feb 27, 2016
a823ef3
Merge pull request #1881 from haocs/release-1.2.2
Feb 27, 2016
9293857
Merge pull request #155 from huangpf/dev
huangpf Feb 27, 2016
f940b50
Merge pull request #447 from AzureRT/dev
huangpf Feb 27, 2016
5c68570
Merge pull request #1882 from begoldsm/dev
Feb 29, 2016
05fa6cb
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
gucalder Feb 29, 2016
6c71bda
Fixed null reff exception in Select-AzureSubscription cmdlet
Feb 29, 2016
da96473
Fix typo in Set-AzureBatchPool example
Feb 29, 2016
067b696
Merge pull request #1884 from AuxMon/dev
Feb 29, 2016
508682b
Merge pull request #1887 from hovsepm/release-1.2.2
Feb 29, 2016
ceef420
Update changelog for AzureRT
hyonholee Mar 1, 2016
1b006dd
Updating common authentication name
markcowl Mar 1, 2016
c41693c
Updating wix file for new dll name
markcowl Mar 1, 2016
a4614cf
Merge pull request #1892 from hyonholee/release-1.2.2
Mar 1, 2016
742bd52
Merge pull request #1894 from jasper-schneider/batchHelpTypo
Mar 1, 2016
206c6c3
Merge pull request #1893 from markcowl/release-1.2.2
Mar 1, 2016
b125835
Updating documentation script
markcowl Mar 2, 2016
22a5c9f
Merge pull request #1898 from markcowl/docs2
Mar 2, 2016
0b0e3df
Update ChangeLog.md
Mar 3, 2016
5ab7c15
Merge pull request #1903 from Azure/release-1.2.2
Mar 4, 2016
f1176c5
Merge pull request #1904 from Azure/master
Mar 4, 2016
9328f92
Merge pull request #448 from Azure/dev
huangpf Mar 4, 2016
d9198fa
Merge pull request #450 from huangpf/dev
huangpf Mar 4, 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
13 changes: 12 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
##2016.03.08 version 1.3.0
##2016.03.03 version 1.2.2
* Azure Compute (ARM):
* Add -LicenseType parameter to New-AzureRmVM for bring your own license (BYOL)
* Add -SecureExecution parameter to Set-AzureRmVMCustomScriptExtension
* Add -DisableAutoUpgradeMinorVersion and -ForceRerun parameters to Set-AzureRmVMExtension
* Add Set-AzureRmVMPlan cmdlet
* Add -Redeploy parameter to Set-AzureRmVM
* Add AutoUpgradeMinorVersion and ForceUpdateTag parameters for Get-AzureRmVMExtension
* Update positions of parameters for New-AzureRmVM
* Azure Compute (Service Management):
* Add Set-AzureBootDiagnostics cmdlets
* Enable boot diagnostics by default for New-AzureVM and New-AzureQuickVM
* Azure LogicApp: New cmdlets for managing LogicApps
* Get-AzureLogicAppAccessKey
* Get-AzureLogicApp
Expand Down
4 changes: 2 additions & 2 deletions setup/azurecmd.wxs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

<?define productName="Microsoft Azure PowerShell - February 2016" ?>
<?define productName="Microsoft Azure PowerShell - March 2016" ?>
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="1.2.1" ?>
<?define version="1.2.2" ?>

<Product Id="*"
Name="$(var.productName)"
Expand Down
372 changes: 184 additions & 188 deletions setup/azurecmdfiles.wxi

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
<AssemblyName>Commands.Common.Authentication</AssemblyName>
<AssemblyName>Microsoft.Azure.Commands.Common.Authentication</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,19 @@ public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureEnviro
}

/// <summary>
/// Creates the client.
/// </summary>
/// <typeparam name="TClient"></typeparam>
/// <param name="subscription"></param>
/// <param name="endpoint"></param>
/// <typeparam name="TClient">The type of the client.</typeparam>
/// <param name="profile">The profile.</param>
/// <param name="subscription">The subscription.</param>
/// <param name="endpoint">The endpoint.</param>
/// <returns></returns>
/// <exception cref="System.ApplicationException"></exception>
/// <exception cref="System.ArgumentException">
/// accountName
/// or
/// environment
/// </exception>
public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureSubscription subscription, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
{
if (subscription == null)
Expand Down Expand Up @@ -287,7 +295,7 @@ public void AddUserAgent(string productName)

public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }

private DelegatingHandler[] GetCustomHandlers()
public DelegatingHandler[] GetCustomHandlers()
{
List<DelegatingHandler> newHandlers = new List<DelegatingHandler>();
var enumerator = _handlers.GetEnumerator();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public interface IClientFactory
/// <param name="productName">Product name.</param>
void AddUserAgent(string productName);

/// <summary>
/// Gets the custom handlers.
/// </summary>
/// <returns>An array of custom handlers</returns>
DelegatingHandler[] GetCustomHandlers();

/// <summary>
/// Adds user agent to UserAgents collection.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
// Do nothing
}

public DelegatingHandler[] GetCustomHandlers()
{
// the equivalent of doing nothing
return new DelegatingHandler[0];
}

public void AddUserAgent(string productName, string productVersion)
{
this.UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Storage/Azure.Storage.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Automation/AzureRM.Automation.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/AzureBackup/AzureRM.Backup.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/AzureBatch/AzureRM.Batch.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11195,7 +11195,7 @@
PS C:\&gt; $StartTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask
PS C:\&gt; $StartTask.CommandLine = "cmd /c echo example"
PS C:\&gt; $Pool.StartTask = $StartTask
PS C:\&gt; Set-AzureBatchPool -PSCloudPool $Pool -BatchContext $Context
PS C:\&gt; Set-AzureBatchPool -Pool $Pool -BatchContext $Context
</dev:code>
<dev:remarks>
<maml:para>The first command gets a pool by using Get-AzureBatchPool, and then stores it in the $Pool variable. </maml:para>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ModuleToProcess = 'Microsoft.AzureStack.Commands.dll'

# Version number of this module.
ModuleVersion = '0.9.1'
ModuleVersion = '0.9.2'

# ID used to uniquely identify this module
GUID = '0e691e0a-ce16-40f2-af84-86fb0d82fb29'
Expand Down Expand Up @@ -48,7 +48,7 @@ CLRVersion = '4.0'
ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.3'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="AzureStackMachineName" value="azstackvm"/>
Expand All @@ -11,4 +11,4 @@
<add key="AadLoginUri" value="https://login.windows.net/"/>
<add key="AadGraphUri" value="https://graph.windows.net/"/>
</appSettings>
</configuration>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="App.config" />
<None Include="AzureStackTests.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '0.9.2'
ModuleVersion = '0.9.3'

# ID used to uniquely identify this module
GUID = 'DA5816B5-97A6-4301-9AA0-72CC68C79F20'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.3'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down Expand Up @@ -85,4 +85,4 @@ FileList = @()
# Private data to pass to the module specified in ModuleToProcess
PrivateData = ''

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = currentEnvironment.Endpoints.ResourceManagementUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.Graph] = currentEnvironment.Endpoints.GraphUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix] = currentEnvironment.Endpoints.DataLakeAnalyticsJobAndCatalogServiceUri.OriginalString.Replace("https://",""); // because it is just a sufix
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix] = currentEnvironment.Endpoints.DataLakeStoreServiceUri.OriginalString.Replace("https://", ""); // because it is just a sufix

if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
// Do nothing
}

public DelegatingHandler[] GetCustomHandlers()
{
// the equivalent of doing nothing
return new DelegatingHandler[0];
}

public void AddUserAgent(string productName, string productVersion)
{
this.UniqueUserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));
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 @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = 'e3c0f6bc-fe96-41a0-88f4-5e490a91f05d'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.4'
ModuleVersion = '1.0.5'

# ID used to uniquely identify this module
GUID = 'eca73aa1-a68f-4ceb-9775-70759316a57b'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4' })
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Loading