Skip to content

Commit 3f7f5f2

Browse files
anton-evseevanton-evseev
committed
Merge branch 'master' into merge-network
# Conflicts: # src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj # src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
2 parents 3196d8e + 2e52060 commit 3f7f5f2

File tree

1,049 files changed

+956261
-332328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,049 files changed

+956261
-332328
lines changed

‎.azure-pipelines/powershell-core.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
variables:
22
WindowsName: windows
3-
WindowsImage: VS2017-Win2016
3+
WindowsImage: vs2017-win2016
44
LinuxName: linux
5-
LinuxImage: Ubuntu-16.04
5+
LinuxImage: ubuntu-18.04
66
MacOSName: macOS
77
MacOSImage: macOS-10.13
88
TestFramework: netcoreapp2.1
@@ -18,6 +18,9 @@ jobs:
1818
windows:
1919
OSName: ${{ variables.WindowsName }}
2020
ImageName: ${{ variables.WindowsImage }}
21+
linux:
22+
OSName: ${{ variables.LinuxName }}
23+
ImageName: ${{ variables.LinuxImage }}
2124
macOS:
2225
OSName: ${{ variables.MacOSName }}
2326
ImageName: ${{ variables.MacOSImage }}
@@ -40,6 +43,9 @@ jobs:
4043
windows:
4144
OSName: ${{ variables.WindowsName }}
4245
ImageName: ${{ variables.WindowsImage }}
46+
linux:
47+
OSName: ${{ variables.LinuxName }}
48+
ImageName: ${{ variables.LinuxImage }}
4349
macOS:
4450
OSName: ${{ variables.MacOSName }}
4551
ImageName: ${{ variables.MacOSImage }}
@@ -62,6 +68,9 @@ jobs:
6268
windows:
6369
OSName: ${{ variables.WindowsName }}
6470
ImageName: ${{ variables.WindowsImage }}
71+
linux:
72+
OSName: ${{ variables.LinuxName }}
73+
ImageName: ${{ variables.LinuxImage }}
6574
macOS:
6675
OSName: ${{ variables.MacOSName }}
6776
ImageName: ${{ variables.MacOSImage }}
@@ -74,4 +83,4 @@ jobs:
7483
osName: $(OSName)
7584
testFramework: ${{ variables.TestFramework }}
7685
testTarget: ${{ variables.TestTarget }}
77-
configuration: ${{ variables.Configuration }}
86+
configuration: ${{ variables.Configuration }}

‎.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: AzureRM module bug report
33
about: Report errors or unexpected behaviors for the AzureRM module
44
title: ''
5-
labels: ''
5+
labels: triage
66
assignees: ''
77

88
---

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
## Checklist
88

9-
- [ ] I have read the [_Submitting Changes_](../CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../CONTRIBUTING.md)
9+
- [ ] I have read the [_Submitting Changes_](../blob/master/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/master/CONTRIBUTING.md)
1010
- [ ] The title of the PR is clear and informative
1111
- [ ] The appropriate `ChangeLog.md` file(s) has been updated:
1212
- For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
1313
- A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header -- no new version header should be added
14-
- [ ] The PR does not introduce [breaking changes](../documentation/breaking-changes/breaking-changes-definition.md)
14+
- [ ] The PR does not introduce [breaking changes](../blob/master/documentation/breaking-changes/breaking-changes-definition.md)
1515
- [ ] If applicable, the changes made in the PR have proper test coverage
1616
- [ ] For public API changes to cmdlets:
1717
- [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
18-
- [ ] the markdown help files have been regenerated using the commands listed [here](../documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
18+
- [ ] the markdown help files have been regenerated using the commands listed [here](../blob/master/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

‎ChangeLog.md

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,93 @@
1+
## 2.8.0 - October 2019
2+
### General
3+
* Az.HealthcareApis 1.0.0 release
4+
5+
#### Az.Accounts
6+
* Update telemetry and url rewriting for generated modules, fix windows unit tests.
7+
8+
#### Az.ApiManagement
9+
* **Set-AzApiManagementApi** - Added support for Updating Api into ApiVersionSet
10+
- Fix for issue https://github.com/Azure/azure-powershell/issues/10068
11+
12+
#### Az.Automation
13+
* Fixed New-AzureAutomationSoftwareUpdateConfiguration cmdlet for Linux reboot setting parameter.
14+
15+
#### Az.Batch
16+
* **Get-AzBatchNodeAgentSku** is deprecated and will be replaced by **Get-AzBatchSupportImage** in version 2.0.0.
17+
18+
#### Az.Compute
19+
* Add Priority, EvictionPolicy, and MaxPrice parameters to New-AzVM and New-AzVmss cmdlets
20+
* Fix warning message and help document for Add-AzVMAdditionalUnattendContent and Add-AzVMSshPublicKey cmdlets
21+
* Fix -skipVmBackup exception for Linux VMs with managed disks for Set-AzVMDiskEncryptionExtension.
22+
* Fix bug in update encryption settings in Set-AzVMDiskEncryptionExtension, two pass scenario.
23+
24+
#### Az.DataFactory
25+
* Adding CRUD commands for ADF V2 data flow: Set-AzDataFactoryV2DataFlow, Remove-AzDataFactoryV2DataFlow, and Get-AzDataFactoryV2DataFlow.
26+
* Adding action commands for ADF V2 data flow debug Session: Start-AzDataFactoryV2DataFlowDebugSession, Get-AzDataFactoryV2DataFlowDebugSession, Add-AzDataFactoryV2DataFlowDebugSessionPackage, Invoke-AzDataFactoryV2DataFlowDebugSessionCommand and Stop-AzDataFactoryV2DataFlowDebugSession.
27+
* Update ADF .Net SDK version to 4.2.0
28+
29+
#### Az.DataLakeStore
30+
* Fix account validation so that accounts with '-' can be passed without domain
31+
32+
#### Az.HealthcareApis
33+
* Updated the powershell version to 1.0.0
34+
* Updated the SDK version to 1.0.2
35+
* Update in tests to refer to new SDK version
36+
* Updated the output structure from nested to flattened.
37+
38+
#### Az.IotHub
39+
* Add new routing source: DigitalTwinChangeEvents
40+
* Minor bug fix: Get-AzIothub not returning subscriptionId
41+
42+
#### Az.Monitor
43+
* New action group receivers added for action group
44+
-ItsmReceiver
45+
-VoiceReceiver
46+
-ArmRoleReceiver
47+
-AzureFunctionReceiver
48+
-LogicAppReceiver
49+
-AutomationRunbookReceiver
50+
-AzureAppPushReceiver
51+
* Use common alert schema enabled for the receivers. This is not applicable for SMS, Azure App push , ITSM and Voice recievers
52+
* Webhooks now supports Azure active directory authentication .
53+
54+
#### Az.Network
55+
* Add new cmdlet Get-AzAvailableServiceAlias which can be called to get the aliases that can be used for Service Endpoint Policies.
56+
* Added support for the adding traffic selectors to Virtual Network Gateway Connections
57+
- New cmdlets added:
58+
- New-AzureRmTrafficSelectorPolicy
59+
- Cmdlets updated with optional parameter -TrafficSelectorPolicies
60+
-New-AzureRmVirtualNetworkGatewayConnection
61+
-Set-AzureRmVirtualNetworkGatewayConnection
62+
* Add support for ESP and AH protocols in network security rule configurations
63+
- Updated cmdlets:
64+
- Add-AzNetworkSecurityRuleConfig
65+
- New-AzNetworkSecurityRuleConfig
66+
- Set-AzNetworkSecurityRuleConfig
67+
* Improve handling of exceptions in Cortex cmdlets
68+
* New Generations and SKUs for VirtualNetworkGateways
69+
- Introduce new Generations for VirtualNetworkGateways.
70+
- Introduce new high throughput SKUs for VirtualNetworkGateways.
71+
72+
#### Az.RedisCache
73+
* Updated 'Set-AzRedisCache' reference documentation to include missing values for '-Size' parameter
74+
75+
#### Az.Sql
76+
* Add support for setting Active Directory Administrator on Managed Instance
77+
78+
#### Az.Storage
79+
* Upgrade Storage Client Library to 11.1.0
80+
* List containers with Management plane API, will list with NextPageLink
81+
- Get-AzRmStorageContainer
82+
* List Storage accounts from subscription, will list with NextPageLink
83+
- Get-AzStorageAccount
84+
85+
#### Az.StorageSync
86+
* Fix Issue 9810 in Reset-AzStorageSyncServerCertificate.
87+
88+
#### Az.Websites
89+
* Set-AzWebApp updating ASP of an app was failing
90+
191
## 2.7.0 - September 2019
292
#### Az.ApiManagement
393
* Update '-Format' parameter description in 'Set-AzApiManagementPolicy' reference documentation

‎documentation/development-docs/azure-powershell-developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ To import modules automatically when debug has started, follow the below steps:
224224

225225
- In the **Debug** tab mentioned previously, go to **Start Options**
226226
- Import the Profile module, along with the module you are testing, by pasting the following in the **Command line arguments** box (_note_: you have to update the <PATH_TO_REPO> and <SERVICE> values provided below):
227-
- `-NoExit -Command "Import-Module <PATH_TO_REPO>/artifacts/Debug/Az.Accounts/Az.Accounts.psd1;Import-Module <PATH_TO_REPO>/artifacts/Debug/Az.<SERVICE>/Az.<SERVICE>.psd1;$VerbosePreference='Continue'"`
227+
- `-NoExit -Command "Import-Module <PATH_TO_REPO>/artifacts/Debug/Az.Accounts/Az.Accounts.psd1;Import-Module <PATH_TO_REPO>/artifacts/Debug/Az.<SERVICE>/Az.<SERVICE>.psd1;$DebugPreference='Continue'"`
228228
- **Note**: if you do not see all of the changes you made to the cmdlets when importing your module in a PowerShell session (_e.g.,_ a cmdlet you added is not recognized as a cmdlet), you may need to delete any existing Azure PowerShell modules that you have on your machine (installed through the PowerShell Gallery) before you import your module.
229229

230230
## Adding Help Content

‎src/Accounts/Accounts/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Add a deprecation message for `Resolve-Error` alias.
2122

2223
## Version 1.6.3
2324
* Update telemetry and url rewriting for generated modules, fix windows unit tests.

‎src/Accounts/Accounts/Errors/ResolveError.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
2020
using System.Collections;
2121
using Microsoft.Azure.Commands.ResourceManager.Common;
22+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
2223

2324
namespace Microsoft.Azure.Commands.Profile.Errors
2425
{
26+
[GenericBreakingChange("The `Resolve-Error` alias will be removed in a future release. Please change any scripts that use this alias to use `Resolve-AzError` instead.")]
2527
[Alias("Resolve-Error")]
2628
[Cmdlet("Resolve", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Error", DefaultParameterSetName = ResolveError.AnyErrorParameterSet)]
2729
[OutputType(typeof(AzureErrorRecord))]

‎src/Accounts/Authentication.Test/Properties/Resources.resx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,21 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="InvalidProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\resources\invalidprofile.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
122+
<value>..\Resources\InvalidProfile.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123123
</data>
124124
<data name="ValidProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\resources\validprofile.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
125+
<value>..\Resources\ValidProfile.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127127
<data name="ValidProfile2" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\resources\validprofile2.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
128+
<value>..\Resources\ValidProfile2.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130130
<data name="ValidProfile3" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>..\resources\validprofile3.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
131+
<value>..\Resources\ValidProfile3.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133133
<data name="ValidProfileChina" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>..\resources\validprofilechina.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
134+
<value>..\Resources\ValidProfileChina.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135135
</data>
136136
<data name="ValidProfileChinaOld" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>..\resources\validprofilechinaold.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137+
<value>..\Resources\ValidProfileChinaOld.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
138138
</data>
139139
</root>

‎src/Advisor/Advisor/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
- Additional information about change #1
2020
-->
2121
## Upcoming Release
22+
* Added new category "Operational Excellence" to Get-AzAdvisorRecommendation cmdlet.
2223

2324
## Version 1.0.1
2425
* Fixed miscellaneous typos across module

‎src/Advisor/Advisor/Cmdlets/GetAzAdvisorRecommendation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class GetAzAdvisorRecommendation : ResourceAdvisorBaseCmdlet
5252
/// </summary>
5353
[Parameter(ParameterSetName = "IdParameterSet", Mandatory = false, HelpMessage = "Category of the recommendation")]
5454
[Parameter(ParameterSetName = "NameParameterSet", Mandatory = false, HelpMessage = "Category of the recommendation")]
55-
[ValidateSet("Cost", "HighAvailability", "Performance", "Security")]
55+
[ValidateSet("Cost", "HighAvailability", "OperationalExcellence", "Performance", "Security")]
5656
public string Category { get; set; }
5757

5858
/// <summary>
@@ -96,4 +96,4 @@ public override void ExecuteCmdlet()
9696
this.WriteObject(results, true);
9797
}
9898
}
99-
}
99+
}

‎src/Advisor/Advisor/Cmdlets/Utilities/RecommendationHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public static List<PsAzureAdvisorResourceRecommendationBase> RecommendationFilte
5151

5252
List<PsAzureAdvisorResourceRecommendationBase> filteredList = new List<PsAzureAdvisorResourceRecommendationBase>();
5353

54-
// Filter by category only if its a valid input
55-
if (Category.Cost.Equals(category) || Category.HighAvailability.Equals(category) || Category.Performance.Equals(category) || Category.Security.Equals(category))
54+
// Filter by category
55+
if (!string.IsNullOrEmpty(category))
5656
{
5757
// If resourceGroup filtering is as well specified
5858
if (!string.IsNullOrEmpty(resourceGroup))

‎src/Advisor/Advisor/help/Get-AzAdvisorRecommendation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Category of the recommendation
8080
Type: String
8181
Parameter Sets: (All)
8282
Aliases:
83-
Accepted values: Cost, HighAvailability, Performance, Security
83+
Accepted values: Cost, HighAvailability, Performance, Security, OperationalExcellence
8484

8585
Required: False
8686
Position: Named

‎src/ApiManagement/ApiManagement/Az.ApiManagement.psd1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 9/19/2019
6+
# Generated on: 10/11/2019
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.3.1'
15+
ModuleVersion = '1.3.2'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -189,8 +189,8 @@ PrivateData = @{
189189
# IconUri = ''
190190

191191
# ReleaseNotes of this module
192-
ReleaseNotes = '* Update ''-Format'' parameter description in ''Set-AzApiManagementPolicy'' reference documentation
193-
* Removed references of deprecated cmdlet ''Update-AzApiManagementDeployment'' from reference documentation. Use ''Set-AzApiManagement'' instead.'
192+
ReleaseNotes = '* **Set-AzApiManagementApi** - Added support for Updating Api into ApiVersionSet
193+
- Fix for issue https://github.com/Azure/azure-powershell/issues/10068'
194194

195195
# Prerelease string of this module
196196
# Prerelease = ''

‎src/ApiManagement/ApiManagement/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
22+
## Version 1.3.2
2123
* **Set-AzApiManagementApi** - Added support for Updating Api into ApiVersionSet
2224
- Fix for issue https://github.com/Azure/azure-powershell/issues/10068
2325

‎src/ApiManagement/ApiManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("1.3.1")]
45-
[assembly: AssemblyFileVersion("1.3.1")]
44+
[assembly: AssemblyVersion("1.3.2")]
45+
[assembly: AssemblyFileVersion("1.3.2")]

‎src/Automation/Automation/Az.Automation.psd1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 9/19/2019
6+
# Generated on: 10/11/2019
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.3.3'
15+
ModuleVersion = '1.3.4'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -168,9 +168,7 @@ PrivateData = @{
168168
# IconUri = ''
169169

170170
# ReleaseNotes of this module
171-
ReleaseNotes = '* Fixed example typo in reference documentation for ''Register-AzAutomationDscNode''
172-
* Added clarification on OS restriction to Register-AzAutomationDSCNode
173-
* Fixed Start-AzAutomationRunbook cmdlet Null reference exception for -Wait option.'
171+
ReleaseNotes = '* Fixed New-AzureAutomationSoftwareUpdateConfiguration cmdlet for Linux reboot setting parameter. '
174172

175173
# Prerelease string of this module
176174
# Prerelease = ''

‎src/Automation/Automation/ChangeLog.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@
1919
-->
2020
## Upcoming Release
2121

22+
## Version 1.3.4
23+
24+
* Fixed New-AzureAutomationSoftwareUpdateConfiguration cmdlet for Linux reboot setting parameter.
25+
2226
## Version 1.3.3
2327
* Fixed example typo in reference documentation for `Register-AzAutomationDscNode`
2428
* Added clarification on OS restriction to Register-AzAutomationDSCNode
2529
* Fixed Start-AzAutomationRunbook cmdlet Null reference exception for -Wait option.
26-
* Fixed New-AzureAutomationSoftwareUpdateConfiguration cmdlet for Linux reboot setting parameter.
2730

2831
## Version 1.3.2
2932
* Fixed miscellaneous typos across module

‎src/Automation/Automation/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("1.3.3")]
47-
[assembly: AssemblyFileVersion("1.3.3")]
46+
[assembly: AssemblyVersion("1.3.4")]
47+
[assembly: AssemblyFileVersion("1.3.4")]
4848
#if !SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Automation.Test")]
5050
#endif

‎src/Batch/Batch.Test/ApplicationPackages/GetBatchApplicationPackageCommandTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public void GetBatchApplicationPackageTest()
4343
{
4444
string accountName = "account01";
4545
string resourceGroup = "resourceGroup";
46-
string applicationId = "test";
46+
string applicationName = "test";
4747
string applicationVersion = "foo";
4848

49-
PSApplicationPackage expected = new PSApplicationPackage() { Id = applicationId, Version = applicationVersion };
50-
batchClientMock.Setup(b => b.GetApplicationPackage(resourceGroup, accountName, applicationId, applicationVersion)).Returns(expected);
49+
PSApplicationPackage expected = new PSApplicationPackage() { Name = applicationVersion };
50+
batchClientMock.Setup(b => b.GetApplicationPackage(resourceGroup, accountName, applicationName, applicationVersion)).Returns(expected);
5151

5252
cmdlet.AccountName = accountName;
5353
cmdlet.ResourceGroupName = resourceGroup;
54-
cmdlet.ApplicationId = applicationId;
54+
cmdlet.ApplicationName = applicationName;
5555
cmdlet.ApplicationVersion = applicationVersion;
5656

5757
cmdlet.ExecuteCmdlet();

0 commit comments

Comments
 (0)