Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
81aa09a
powershell cmdlets for CM v2
hofattahMicrosoft Nov 23, 2019
65af833
Update powershell cmdlets for CMv2
hofattahMicrosoft Nov 26, 2019
de397ec
Update CM v2
hofattahMicrosoft Nov 26, 2019
85a9728
Update CM v2
hofattahMicrosoft Nov 27, 2019
88ecd59
add unit tests
hofattahMicrosoft Nov 28, 2019
ff0a02a
Merge branch 'master' into network-december
hofattahMicrosoft Dec 2, 2019
61f3182
after code review
hofattahMicrosoft Dec 3, 2019
24f9275
fix Tabs
hofattahMicrosoft Dec 3, 2019
cbb3ee6
After review of CM2 cmdlets
hofattahMicrosoft Dec 7, 2019
598233d
And final review for CM2 cmdlets
hofattahMicrosoft Dec 19, 2019
56d40d8
After fixes for CMv2
hofattahMicrosoft Dec 20, 2019
4c6252e
Add new cmdlet for CMv2
hofattahMicrosoft Dec 26, 2019
10b5887
Add new cmdlet for CMv2
hofattahMicrosoft Dec 26, 2019
1512cfe
Add cmV2 new cmdlet
hofattahMicrosoft Dec 26, 2019
df47690
CMv2 fixes after testing
hofattahMicrosoft Dec 28, 2019
4218f45
Update after testing for CMv2
hofattahMicrosoft Dec 31, 2019
756e6f4
Final Update for CMv2
hofattahMicrosoft Dec 31, 2019
f471e74
Merge branch 'master' into network-december
hofattahMicrosoft Dec 31, 2019
99e6b91
Add more validation for CMv2
hofattahMicrosoft Jan 2, 2020
f0ca839
update Set for CMv2
hofattahMicrosoft Jan 3, 2020
fb50556
Minor updates for CMV2
hofattahMicrosoft Jan 4, 2020
1ad83d6
fixes after live testing for CMv2
hofattahMicrosoft Jan 5, 2020
0d3cf8c
Dev changes for hostnames addition in httplistener object
sobaner Jan 13, 2020
3018384
Adding changes in Markdown files for Hostnames
sobaner Jan 13, 2020
015688d
Adding Test Cases
sobaner Jan 14, 2020
bb2471a
Adding newline at the end
sobaner Jan 14, 2020
2700e72
Added support to include subloders when deploying artifacts
tibor19 Jan 14, 2020
71d130e
Updated changelog.md
tibor19 Jan 14, 2020
c2471af
Optimization after testing CMV2
hofattahMicrosoft Jan 14, 2020
81f028c
Adding Scenario Test Recording
sobaner Jan 16, 2020
2b585b3
Fixed Update Api to display pending updates by default
gautamd-ms Jan 16, 2020
8b01f94
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
gautamd-ms Jan 16, 2020
3b6b86f
Final after live testing
hofattahMicrosoft Jan 17, 2020
7eca8bb
Added release notes
gautamd-ms Jan 17, 2020
4afc9f8
Network SDK with API version 2019-11-01
anton-evseev Jan 15, 2020
367fc87
Recordings & fixes
anton-evseev Jan 17, 2020
b88ab56
CredScan suppression
anton-evseev Jan 17, 2020
6278232
Supressing CredScan
sobaner Jan 17, 2020
2fb8ed1
Add support for forced tunneling/management subnet and management IP …
iatodoro Dec 1, 2019
e46b83d
Reverting some merge issues
iatodoro Dec 1, 2019
3d61b1c
Updating tests for management IP changes
iatodoro Dec 1, 2019
32a78ae
Changing management IPconfig name
iatodoro Dec 2, 2019
7b7705a
Adding management IPconfig CRUD test recordings
iatodoro Dec 12, 2019
30a3b5d
Fixing typo in test script
KpaBap Dec 3, 2019
a4ddaff
Add missed command to help example
iatodoro Jan 17, 2020
17305ac
Bumping Management.Network package version to latest
iatodoro Jan 17, 2020
55cda7c
Add two more cmdlets for CMv2
hofattahMicrosoft Jan 18, 2020
072ec4b
Add two more cmdlets for CMv2 with minor fixes
hofattahMicrosoft Jan 18, 2020
13abc02
After some testing
hofattahMicrosoft Jan 19, 2020
49a50af
After some testing again
hofattahMicrosoft Jan 19, 2020
c73efa3
Add help files
hofattahMicrosoft Jan 19, 2020
28f4851
Add more updates for CMv2
hofattahMicrosoft Jan 19, 2020
9a35616
Add more updates for CMv2:2
hofattahMicrosoft Jan 19, 2020
cd29d6d
Update help files and other formatting
hofattahMicrosoft Jan 20, 2020
229d995
Skip unreliable tests
anton-evseev Jan 20, 2020
a74654a
NetApp tests
anton-evseev Jan 20, 2020
9dfee69
rebasing to network-december after squashing commits
abjai Jan 20, 2020
3785622
PR comments
abjai Jan 20, 2020
1d1ac83
adding changelog.md
abjai Jan 20, 2020
83be0e8
Merge pull request #10928 from number213/nrp-2019-11-01
isra-fel Jan 20, 2020
390725d
updating az.network sdk version to 19.18.0-preview
abjai Jan 20, 2020
621e11d
Merge branch 'network-december' into sobaner/wildcardlistener
sobaner Jan 20, 2020
2e47edf
Adding StaticAnalyzer Exceptions for ApplicationGatewayHttpListener O…
sobaner Jan 20, 2020
a8817b1
Adding ShouldProcess to fix staticanalysis
abjai Jan 20, 2020
107b681
Add some behaviour changes in cmdlets for CM2
hofattahMicrosoft Jan 20, 2020
02cc77b
Update help files
hofattahMicrosoft Jan 21, 2020
031e16c
Merge branch 'network-december' into urlrewrite
isra-fel Jan 21, 2020
b923006
Merge branch 'release-2020-02-04' into fixupdateapi
isra-fel Jan 21, 2020
e02e789
Merge pull request #10919 from gautamd-ms/fixupdateapi
isra-fel Jan 21, 2020
6de3ec3
Feb 2020 RC1
isra-fel Jan 21, 2020
1c047cd
add mappings for cosmos db
isra-fel Jan 21, 2020
166835e
fix typo
isra-fel Jan 21, 2020
cb497a7
bump up az accounts reference in databoxedge
isra-fel Jan 21, 2020
92320e7
Fixed csv file
anton-evseev Jan 21, 2020
295cdcd
Merge pull request #10894 from abjai/urlrewrite
anton-evseev Jan 21, 2020
93da0e8
Merge pull request #10943 from Azure/yeliu-2020-02-04
isra-fel Jan 21, 2020
ac5bc9c
Merge branch 'network-december' into merge-network
anton-evseev Jan 21, 2020
90b1e2a
Fixes after merge
anton-evseev Jan 21, 2020
d7f0bc9
Merge branch 'release-2020-02-04' into merge-network
anton-evseev Jan 21, 2020
bf3f4c8
Test recording
anton-evseev Jan 21, 2020
40f7eee
Merge branch 'network-december' into wildcardlistener
anton-evseev Jan 21, 2020
172064b
CredScan suppression
anton-evseev Jan 21, 2020
72e0c58
Update tests after merge
anton-evseev Jan 21, 2020
5092bdf
Merge pull request #10945 from number213/merge-network
isra-fel Jan 21, 2020
5b41610
Merge branch 'release-2020-02-04' into sobaner/wildcardlistener
isra-fel Jan 21, 2020
2f81678
Updating recording for API 2019-11-01
iatodoro Jan 21, 2020
8c930c4
Merge branch 'release-2020-02-04' into azfw_managementIpConfig
iatodoro Jan 21, 2020
f141019
fix headers in help files
hofattahMicrosoft Jan 21, 2020
867ad56
Merge branch 'release-2020-02-04' into network-december
hofattahMicrosoft Jan 21, 2020
b9cbc8f
fix for static analyzer
hofattahMicrosoft Jan 21, 2020
af62b5b
fix for static analyzer
hofattahMicrosoft Jan 21, 2020
db5d324
fix static analyzer issues
hofattahMicrosoft Jan 21, 2020
c647e6e
fix static analyzer issues:3
hofattahMicrosoft Jan 21, 2020
f9b8e8b
fix static analyzer:4
hofattahMicrosoft Jan 21, 2020
3543912
Fix static analyzer:5
hofattahMicrosoft Jan 21, 2020
2d0cb7e
some fixes for CMv2
hofattahMicrosoft Jan 21, 2020
d0ca079
Merge pull request #10878 from sobaner/sobaner/wildcardlistener
isra-fel Jan 22, 2020
456e16e
Merge branch 'release-2020-02-04' into azfw_managementIpConfig
isra-fel Jan 22, 2020
ae1bf99
Merge pull request #10933 from iatodoro/azfw_managementIpConfig
isra-fel Jan 22, 2020
eacb1cc
Merge branch 'release-2020-02-04' into include-subfolders-in-blueprints
isra-fel Jan 22, 2020
84d9c0e
Merge pull request #10893 from tibor19/include-subfolders-in-blueprints
isra-fel Jan 22, 2020
406c5c3
Add a feature of pipelining in Set- cmdlet for CMv1/V2
hofattahMicrosoft Jan 22, 2020
51c806e
Suppress static analyzer errors
hofattahMicrosoft Jan 22, 2020
8d53e4b
Add paramterset for Set- and Get-
hofattahMicrosoft Jan 22, 2020
2c0b5fc
Update breaking.csv file for static analyzer
hofattahMicrosoft Jan 22, 2020
0d64f88
Update breaking.csv file for static analyzer:2
hofattahMicrosoft Jan 22, 2020
8f7a4af
Add more help
hofattahMicrosoft Jan 23, 2020
b18406a
undo file
hofattahMicrosoft Jan 23, 2020
c9d9ad3
After Mark Review
hofattahMicrosoft Jan 23, 2020
45e95a5
After Mark Review:2
hofattahMicrosoft Jan 23, 2020
171e93e
Address Mark comments: 3
hofattahMicrosoft Jan 23, 2020
0468886
Address Mark comments: 4
hofattahMicrosoft Jan 23, 2020
1966829
Address Mark comments: 5
hofattahMicrosoft Jan 23, 2020
e776e64
it1
irrogozh Jan 25, 2020
eacde00
Changes based on discussion after bug bush
irrogozh Jan 26, 2020
0fade91
Fixed merging conflicts and updated help files
irrogozh Jan 26, 2020
614830e
Added examples to help files
irrogozh Jan 26, 2020
f2c476d
Fixed New-AzNetworkWatcherConnectionMonitorTestGroupObject.md
irrogozh Jan 26, 2020
1ecf03c
Made some necessary clode clean up, added validation to endpoint cmdlet
irrogozh Jan 26, 2020
bd90eb1
Minor fixes based on CR
irrogozh Jan 27, 2020
8172311
Fixed creating new connectionMonitor using connectionMonitorObject
irrogozh Jan 27, 2020
94070fa
Added error message strings to Resource.resx
irrogozh Jan 28, 2020
2b26fe5
Merge branch 'release-2020-02-04' into network-december
markcowl Jan 28, 2020
137daab
Fixes based on CR
irrogozh Jan 28, 2020
c8eada9
Fix New-AzSqlDatabaseSecondary existing database name check
bradrich-msft Jan 15, 2020
f99bd0e
Moving name check to method
bradrich-msft Jan 15, 2020
453872b
updated test recording
bradrich-msft Jan 16, 2020
3e71da6
Add bug fix message to changelog
bradrich-msft Jan 21, 2020
335e168
Merge pull request #10983 from bradrich-msft/retarget
markcowl Jan 28, 2020
4e40c23
Merge branch 'release-2020-02-04' into network-december
markcowl Jan 28, 2020
3064ba9
Merge pull request #10948 from hofattahMicrosoft/network-december
markcowl Jan 28, 2020
0d7df5e
Updating versions for Network and SQL Changes
markcowl Jan 29, 2020
42e6af3
Update changelog highlights
markcowl Jan 29, 2020
82e468f
Merge pull request #10993 from markcowl/release-2020-02-04
markcowl Jan 30, 2020
88f49e0
Merging release branch with new changes in master
markcowl Jan 30, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
79 changes: 79 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,82 @@
## 3.4.0 - February 2020
### Highlights since the last major release
* Az.CosmosDB initial version 0.1.0 released
* Az.Network ConnectionMonitor V2 support added

#### Az.Accounts
* Disable context auto saving when AzureRmContext.json not available
* Update the reference to Azure Powershell Common to 1.3.5-preview

#### Az.ApiManagement
* **Get-AzApiManagementApiSchema** Fixed getting Open-Api Schema associated with an API
https://github.com/Azure/azure-powershell/issues/10626
* **New-AzApiManagementProduct*** and **Set-AzApiManagementProduct**
- Fix documentation for https://github.com/Azure/azure-powershell/issues/10472
* **Set-AzApiManagementApi**
Added example to show how to update the ServiceUrl using the cmdlet

#### Az.Compute
* Limit the number of VM status to 100 to avoid throttling when Get-AzVM -Status is performed without VM name.
* Add Update-AzDiskEncryptionSet cmdlet
* Add EncryptionType and DiskEncryptionSetId parameters to the following cmdlets:
- New-AzDiskUpdateConfig, New-AzSnapshotUpdateConfig
* Add ColocationStatus parameter to Get-AzProximityPlacementGroup cmdlet.

#### Az.DataFactory
* Update ADF .Net SDK version to 4.7.0

#### Az.DeploymentManager
* Adds LIST operations for resources
* Adds capability for performing operations on Health Check steps

#### Az.HDInsight
* Fix document error of New-AzHDInsightCluster.

#### Az.KeyVault
* Add Name alias to VaultName attribute to make Remove-AzureKeyVault consistent with New-AzureKeyVault.

#### Az.Network
* New example added to Set-AzNetworkWatcherConfigFlowLog.md to demonstrate Traffic Analytics disable scenario.
* Add support for assigning management IP configuration to Azure Firewall - a dedicated subnet and Public IP that the firewall will use for its management traffic
- Updated New-AzFirewall cmdlet:
- Added parameter -ManagementPublicIpAddress (not mandatory) which accepts a Public IP Address object
- Added method SetManagementIpConfiguration on firewall object - requires a subnet and a Public IP address as input - subnet name must be 'AzureFirewallManagementSubnet'
* Corrected Get-AzNetworkSecurityGroup examples to show examples for NSG's instead of network interfaces.
* Fixed typo in New-AzureRmVpnSite command that was preventing resource id completer from completing a parameter.
* Added support for Url Confiugration in Rewrite Rules Action Set in the Application Gateway
- New cmdlets added:
- New-AzApplicationGatewayRewriteRuleUrlConfiguration
- Cmdlets updated with optional parameter - UrlConfiguration
- New-AzApplicationGatewayRewriteRuleActionSet
* Add suppport for NetworkWatcher ConnectionMonitor version 2 resources

#### Az.PolicyInsights
* Support evaluating compliance prior to determining what resource to remediate
- Add '-ResourceDiscoverMode' parameter to Start-AzPolicyRemediation
* Add Get-AzPolicyMetadata cmdlet for getting policy metadata resources
* Updated Get-AzPolicyState and Get-AzPolicyStateSummary for API version 2019-10-01

#### Az.RecoveryServices
* Azure Site Recovery support for removing a replicated disk.
* Azure Backup added support for adding tags while creating a Recovery Services Vault.

#### Az.Resources
* Make -Scope optional in *-AzPolicyAssignment cmdlets with default to context subscription
* Add examples of creating ADServicePrincipal with password and key credential

#### Az.Sql
Fix New-AzSqlDatabaseSecondary cmdlet to check for PartnerDatabaseName existence instead of DatabaseName existence.

#### Az.Storage
* Support set Table/Queue Encryption Keytype in Create Storage Account
- New-AzRmStorageAccount
* Show RequestId when StorageException don't have ExtendedErrorInformation
* Fix the Example 6 of cmdlet Start-AzStorageBlobCopy

#### Az.Websites
* Set-AzWebapp and Set-AzWebappSlot supports AlwaysOn, MinTls and FtpsState properties
* Fixing issue where setting HttpsOnly along with changing AppservicePlan at the same time using the single Set-AzWebApp Command, was resetting HttpsOnly to default value

## 3.3.0 - January 2020
#### Az.Accounts
* Updated Add-AzEnvironment and Set-AzEnvironment to accept parameters AzureAttestationServiceEndpointResourceId and AzureAttestationServiceEndpointSuffix
Expand Down
7 changes: 4 additions & 3 deletions src/Accounts/Accounts/Az.Accounts.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 1/2/2020
# Generated on: 1/21/2020
#

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

# Version number of this module.
ModuleVersion = '1.7.0'
ModuleVersion = '1.7.1'

# Supported PSEditions
CompatiblePSEditions = 'Core', 'Desktop'
Expand Down Expand Up @@ -142,7 +142,8 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Updated Add-AzEnvironment and Set-AzEnvironment to accept parameters AzureAttestationServiceEndpointResourceId and AzureAttestationServiceEndpointSuffix'
ReleaseNotes = '* Disable context auto saving when AzureRmContext.json not available
* Update the reference to Azure Powershell Common to 1.3.5-preview'

# Prerelease string of this module
# Prerelease = ''
Expand Down
1 change: 1 addition & 0 deletions src/Accounts/Accounts/AzureRmAlias/Mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,7 @@
"New-AzApplicationGatewayRewriteRule": "New-AzureRmApplicationGatewayRewriteRule",
"New-AzApplicationGatewayRewriteRuleActionSet": "New-AzureRmApplicationGatewayRewriteRuleActionSet",
"New-AzApplicationGatewayRewriteRuleHeaderConfiguration": "New-AzureRmApplicationGatewayRewriteRuleHeaderConfiguration",
"New-AzApplicationGatewayRewriteRuleUrlConfiguration": "New-AzureRmApplicationGatewayRewriteRuleUrlConfiguration",
"New-AzApplicationGatewayRewriteRuleCondition": "New-AzureRmApplicationGatewayRewriteRuleCondition",
"Add-AzApplicationGatewayRedirectConfiguration": "Add-AzureRmApplicationGatewayRedirectConfiguration",
"Get-AzApplicationGatewayRedirectConfiguration": "Get-AzureRmApplicationGatewayRedirectConfiguration",
Expand Down
2 changes: 2 additions & 0 deletions src/Accounts/Accounts/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Upcoming Release

## Version 1.7.1
* Disable context auto saving when AzureRmContext.json not available
* Update the reference to Azure Powershell Common to 1.3.5-preview

Expand Down
4 changes: 2 additions & 2 deletions src/Accounts/Accounts/Properties/AssemblyInfo.cs
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("1.7.0")]
[assembly: AssemblyFileVersion("1.7.0")]
[assembly: AssemblyVersion("1.7.1")]
[assembly: AssemblyFileVersion("1.7.1")]
#if !SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/Advisor/Advisor/Az.Advisor.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.Advisor.dll'
Expand Down
2 changes: 1 addition & 1 deletion src/Aks/Aks/Az.Aks.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'YamlDotNet.dll', 'AutoMapper.dll'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.AlertsManagement.dll'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.Analysis.dll'
Expand Down
13 changes: 9 additions & 4 deletions src/ApiManagement/ApiManagement/Az.ApiManagement.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 12/11/2019
# Generated on: 1/21/2020
#

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

# Version number of this module.
ModuleVersion = '1.3.3'
ModuleVersion = '1.3.4'

# Supported PSEditions
CompatiblePSEditions = 'Core', 'Desktop'
Expand Down Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'AutoMapper.dll', 'Microsoft.Azure.Management.ApiManagement.dll',
Expand Down Expand Up @@ -188,7 +188,12 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Update references in .psd1 to use relative path'
ReleaseNotes = '* **Get-AzApiManagementApiSchema** Fixed getting Open-Api Schema associated with an API
https://github.com/Azure/azure-powershell/issues/10626
* **New-AzApiManagementProduct*** and **Set-AzApiManagementProduct**
- Fix documentation for https://github.com/Azure/azure-powershell/issues/10472
* **Set-AzApiManagementApi**
Added example to show how to update the ServiceUrl using the cmdlet'

# Prerelease string of this module
# Prerelease = ''
Expand Down
2 changes: 2 additions & 0 deletions src/ApiManagement/ApiManagement/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Upcoming Release

## Version 1.3.4
* **Get-AzApiManagementApiSchema** Fixed getting Open-Api Schema associated with an API
https://github.com/Azure/azure-powershell/issues/10626

Expand Down
4 changes: 2 additions & 2 deletions src/ApiManagement/ApiManagement/Properties/AssemblyInfo.cs
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("1.3.3")]
[assembly: AssemblyFileVersion("1.3.3")]
[assembly: AssemblyVersion("1.3.4")]
[assembly: AssemblyFileVersion("1.3.4")]
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.ApplicationInsights.dll'
Expand Down
2 changes: 1 addition & 1 deletion src/Attestation/Attestation/Az.Attestation.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.Attestation.dll'
Expand Down
2 changes: 1 addition & 1 deletion src/Automation/Automation/Az.Automation.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.Automation.dll'
Expand Down
2 changes: 1 addition & 1 deletion src/Batch/Batch/Az.Batch.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Batch.dll', 'Microsoft.Azure.Management.Batch.dll',
Expand Down
2 changes: 1 addition & 1 deletion src/Billing/Billing/Az.Billing.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.Billing.dll',
Expand Down
8 changes: 4 additions & 4 deletions src/Blueprint/Blueprint/Az.Blueprint.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 12/16/2019
# Generated on: 1/29/2020
#

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

# Version number of this module.
ModuleVersion = '0.2.9'
ModuleVersion = '0.2.10'

# Supported PSEditions
CompatiblePSEditions = 'Core', 'Desktop'
Expand Down Expand Up @@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.0'; })
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.1'; })

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = 'Microsoft.Azure.Management.Blueprint.dll'
Expand Down Expand Up @@ -114,7 +114,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Update references in .psd1 to use relative path'
ReleaseNotes = '* Added support to include subfolders when deploying blueprints with artifacts'

# Prerelease string of this module
# Prerelease = ''
Expand Down
3 changes: 3 additions & 0 deletions src/Blueprint/Blueprint/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
-->
## Upcoming Release

## Version 0.2.10
* Added support to include subfolders when deploying blueprints with artifacts

## Version 0.2.9
* Update references in .psd1 to use relative path

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ protected string CreateFolderIfNotExist(string path, string folderName)
return folderPath;
}

protected void ImportArtifacts(string blueprintName, string scope, string inputPath)
protected void ImportArtifacts(string blueprintName, string scope, string inputPath, bool includeSubfolders = false)
{
var artifactsPath = GetValidatedFolderPathForArtifacts(ResolveUserPath(inputPath));

Expand All @@ -176,7 +176,7 @@ protected void ImportArtifacts(string blueprintName, string scope, string inputP
return; // if blueprint doesn't contain artifacts don't proceed.
}

var artifactFiles = AzureSession.Instance.DataStore.GetFiles(artifactsPath, "*.json", SearchOption.TopDirectoryOnly);
var artifactFiles = AzureSession.Instance.DataStore.GetFiles(artifactsPath, "*.json", includeSubfolders ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);

foreach (var artifactFile in artifactFiles)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public class ImportAzureRmBlueprint : BlueprintDefinitionCmdletBase
[ValidateNotNullOrEmpty]
public string InputPath { get; set; }

[Parameter(ParameterSetName = ParameterSetNames.ImportBlueprintParameterSet, Mandatory = false, HelpMessage = ParameterHelpMessages.ImportIncludeSubFolders)]
public SwitchParameter IncludeSubFolders { get; set; }

[Parameter(ParameterSetName = ParameterSetNames.ImportBlueprintParameterSet, Mandatory = false, HelpMessage = ParameterHelpMessages.ForceHelpMessage)]
public SwitchParameter Force { get; set; }

Expand All @@ -56,7 +59,7 @@ public override void ExecuteCmdlet()
: Utils.GetScopeForSubscription(SubscriptionId ?? DefaultContext.Subscription.Id);

ImportBlueprint(Name, scope, InputPath, Force);
ImportArtifacts(Name, scope, InputPath);
ImportArtifacts(Name, scope, InputPath, IncludeSubFolders);

if (PassThru.IsPresent)
{
Expand Down
1 change: 1 addition & 0 deletions src/Blueprint/Blueprint/Common/BlueprintConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public static class ParameterHelpMessages
public const string ExportOutputFile = "Path to a file on disk where to export the Blueprint definition in JSON format.";
public const string ForceHelpMessage = "When set to true, execution will not ask for a confirmation.";
public const string ImportInputPath = "Path to a Blueprint JSON file on disk.";
public const string ImportIncludeSubFolders = "If sub folders should be included.";
public const string ChangeNotes = "Notes to describe the contents of this blueprint version.";
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Blueprint/Blueprint/Properties/AssemblyInfo.cs
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("0.2.9")]
[assembly: AssemblyFileVersion("0.2.9")]
[assembly: AssemblyVersion("0.2.10")]
[assembly: AssemblyFileVersion("0.2.10")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Blueprint.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#else
Expand Down
Loading