Skip to content

Merge release -> master for Release 4.2.1 #4326

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 10 commits into from
Jul 18, 2017
Merged
14 changes: 13 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
## 2017.7.11 - Version 4.2.0
## 2017.07.17 - Version 4.2.1
* Compute
- Fix issue with VM DIsk and VM Disk snapshot create and update cmdlets, (link)[https://github.com/azure/azure-powershell/issues/4309]
- New-AzureRmDisk
- New-AzureRmSnapshot
- Update-AzureRmDisk
- Update-AzureRmSnapshot
* Profile
- Fix issue with non-interactive user authentication in RDFE (link)[https://github.com/Azure/azure-powershell/issues/4299]
* ServiceManagement
- Fix issue with non-interactive user authentication (link)[https://github.com/Azure/azure-powershell/issues/4299]

## 2017.7.11 - Version 4.2.0
* AnalysisServices
* Add new dataplane API
- Introduced API to fetch AS server log, Export-AzureAnalysisServicesInstanceLog
Expand Down
2 changes: 1 addition & 1 deletion setup/azurecmd.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="4.2.0" ?>
<?define version="4.2.1" ?>

<Product Id="*"
Name="$(var.productName)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(IAzureContex
context.Account.Id,
context.Environment.Name,
tenant);
if (context.TokenCache != null)
if (context.TokenCache != null && context.TokenCache.CacheData != null && context.TokenCache.CacheData.Length > 0)
{
tokenCache = context.TokenCache;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common/AzurePowerShell.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public class AzurePowerShell

public const string AssemblyCopyright = "Copyright © Microsoft";

public const string AssemblyVersion = "4.2.0";
public const string AssemblyVersion = "4.2.1";

public const string AssemblyFileVersion = "4.2.0";
public const string AssemblyFileVersion = "4.2.1";

public const string ProfileFile = "AzureProfile.json";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/6/2017
# Generated on: 7/14/2017
#

@{
Expand All @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.4.1'
ModuleVersion = '0.4.2'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -51,7 +51,7 @@ CLRVersion = '4.0'
# ProcessorArchitecture = ''

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

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand Down Expand Up @@ -86,6 +86,7 @@ CmdletsToExport = 'Resume-AzureRmAnalysisServicesServer',
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
AliasesToExport = 'Resume-AzureAs', 'Suspend-AzureAs', 'Get-AzureAs', 'Remove-AzureAs',
'Set-AzureAs', 'Test-AzureAs', 'New-AzureAs'

# DSC resources to export from this module
# DscResourcesToExport = @()

Expand Down Expand Up @@ -113,8 +114,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Add new dataplane API
- Introduced API to fetch AS server log, Export-AzureAnalysisServicesInstanceLog'
ReleaseNotes = 'Updated for common code changes'

# External dependent modules of this module
# ExternalModuleDependencies = ''
Expand Down
4 changes: 3 additions & 1 deletion src/ResourceManager/AnalysisServices/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
-->
## Current Release

## Version 0.4.2

## Version 0.4.1
* Add new dataplane API
- Introduced API to fetch AS server log, Export-AzureAnalysisServicesInstanceLog
Expand Down Expand Up @@ -47,4 +49,4 @@

## Version 0.0.2
* Fixed bug in Get-AzureRMAnalysisServicesServer
- When this command was run against some resources, it would fail with a null reference exception.
- When this command was run against some resources, it would fail with a null reference exception.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '0.4.1'
ModuleVersion = '0.4.2'

# ID used to uniquely identify this module
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// by using the '*' as shown below:


[assembly: AssemblyVersion("0.4.1")]
[assembly: AssemblyFileVersion("0.4.1")]
[assembly: AssemblyVersion("0.4.2")]
[assembly: AssemblyFileVersion("0.4.2")]
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@

[assembly: Guid("37af97fd-d603-4d52-a7a6-0885004a57fe")]

[assembly: AssemblyVersion("0.4.1")]
[assembly: AssemblyFileVersion("0.4.1")]
[assembly: AssemblyVersion("0.4.2")]
[assembly: AssemblyFileVersion("0.4.2")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// by using the '*' as shown below:


[assembly: AssemblyVersion("0.4.1")]
[assembly: AssemblyFileVersion("0.4.1")]
[assembly: AssemblyVersion("0.4.2")]
[assembly: AssemblyFileVersion("0.4.2")]
6 changes: 3 additions & 3 deletions src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/6/2017
# Generated on: 7/14/2017
#

@{
Expand All @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '4.2.0'
ModuleVersion = '4.2.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -51,7 +51,7 @@ CLRVersion = '4.0'
# ProcessorArchitecture = ''

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

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand Down
2 changes: 2 additions & 0 deletions src/ResourceManager/ApiManagement/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
-->
## Current Release

## Version 4.2.1

## Version 4.2.0

## Version 4.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("4.2.0")]
[assembly: AssemblyFileVersion("4.2.0")]
[assembly: AssemblyVersion("4.2.1")]
[assembly: AssemblyFileVersion("4.2.1")]
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("4.2.0")]
[assembly: AssemblyFileVersion("4.2.0")]
[assembly: AssemblyVersion("4.2.1")]
[assembly: AssemblyFileVersion("4.2.1")]
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("4.2.0")]
[assembly: AssemblyFileVersion("4.2.0")]
[assembly: AssemblyVersion("4.2.1")]
[assembly: AssemblyFileVersion("4.2.1")]
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("4.2.0")]
[assembly: AssemblyFileVersion("4.2.0")]
[assembly: AssemblyVersion("4.2.1")]
[assembly: AssemblyFileVersion("4.2.1")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
10 changes: 4 additions & 6 deletions src/ResourceManager/Automation/AzureRM.Automation.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/6/2017
# Generated on: 7/14/2017
#

@{
Expand All @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '3.2.0'
ModuleVersion = '3.2.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -51,7 +51,7 @@ CLRVersion = '4.0'
# ProcessorArchitecture = ''

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

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand Down Expand Up @@ -160,9 +160,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Properly setting TimeZone value for Weekly and Monthly schedules for New-AzureRmAutomationSchedule
- More information can be found in this issue: https://github.com/Azure/azure-powershell/issues/3043
'
ReleaseNotes = 'Updated for common code changes'

# External dependent modules of this module
# ExternalModuleDependencies = ''
Expand Down
2 changes: 2 additions & 0 deletions src/ResourceManager/Automation/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
-->
## Current Release

## Version 3.2.1

## Version 3.2.0
* Properly setting TimeZone value for Weekly and Monthly schedules for New-AzureRmAutomationSchedule
- More information can be found in this issue: https://github.com/Azure/azure-powershell/issues/3043
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("3.2.0")]
[assembly: AssemblyFileVersion("3.2.0")]
[assembly: AssemblyVersion("3.2.1")]
[assembly: AssemblyFileVersion("3.2.1")]
[assembly: CLSCompliant(false)]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("3.2.0")]
[assembly: AssemblyFileVersion("3.2.0")]
[assembly: AssemblyVersion("3.2.1")]
[assembly: AssemblyFileVersion("3.2.1")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#else
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/AzureBackup/AzureRM.Backup.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/6/2017
# Generated on: 7/14/2017
#

@{
Expand All @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '3.2.0'
ModuleVersion = '3.2.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -51,7 +51,7 @@ CLRVersion = '4.0'
# ProcessorArchitecture = ''

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

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand Down
2 changes: 2 additions & 0 deletions src/ResourceManager/AzureBackup/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
-->
## Current Release

## Version 3.2.1

## Version 3.2.0

## Version 3.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("3.2.0")]
[assembly: AssemblyFileVersion("3.2.0")]
[assembly: AssemblyVersion("3.2.1")]
[assembly: AssemblyFileVersion("3.2.1")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]

[assembly: AssemblyVersion("3.2.0")]
[assembly: AssemblyFileVersion("3.2.0")]
[assembly: AssemblyVersion("3.2.1")]
[assembly: AssemblyFileVersion("3.2.1")]
10 changes: 4 additions & 6 deletions src/ResourceManager/AzureBatch/AzureRM.Batch.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 7/6/2017
# Generated on: 7/14/2017
#

@{
Expand All @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '3.2.0'
ModuleVersion = '3.2.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -51,7 +51,7 @@ CLRVersion = '4.0'
# ProcessorArchitecture = ''

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

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand Down Expand Up @@ -141,9 +141,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '- Added new Get-AzureBatchJobPreparationAndReleaseTaskStatus cmdlet.
- Added byte range start and end to Get-AzureBatchNodeFileContent parameters.
'
ReleaseNotes = 'Updated for common code changes'

# External dependent modules of this module
# ExternalModuleDependencies = ''
Expand Down
2 changes: 2 additions & 0 deletions src/ResourceManager/AzureBatch/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
-->
## Current Release

## Version 3.2.1

## Version 3.2.0
- Added new Get-AzureBatchJobPreparationAndReleaseTaskStatus cmdlet.
- Added byte range start and end to Get-AzureBatchNodeFileContent parameters.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("3.2.0")]
[assembly: AssemblyFileVersion("3.2.0")]
[assembly: AssemblyVersion("3.2.1")]
[assembly: AssemblyFileVersion("3.2.1")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("ed102280-3577-49bf-93dd-11b6e3a44a57")]
[assembly: AssemblyVersion("3.2.0")]
[assembly: AssemblyFileVersion("3.2.0")]
[assembly: AssemblyVersion("3.2.1")]
[assembly: AssemblyFileVersion("3.2.1")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Batch.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#else
Expand Down
Loading