Skip to content

Commit 8836932

Browse files
MiYanniMiYanni
authored
Merge pull request #5 from Azure/release-6.2.0
Release 6.2.0 merge
2 parents 109f5ca + 71700b3 commit 8836932

File tree

669 files changed

+50880
-18537
lines changed

Some content is hidden

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

669 files changed

+50880
-18537
lines changed

‎AzurePowershell.Test.targets‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,13 @@
5454
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
5555
ContinueOnError="false" />
5656
</Target>
57-
<Target Name="DeclareXunitTests">
58-
<!--Get list of tests to be run based on files changed from a specified PullRequestNumber. Mapping between paths and test DLLs is used to produce the list.-->
59-
<SmartTestingTask RepositoryOwner="Azure" RepositoryName="azure-powershell" PullRequestNumber="$(PullRequestNumber)" MapFilePath=".\TestMappings.json">
60-
<Output TaskParameter ="TestAssemblies" ItemName="XUnitTests"/>
61-
</SmartTestingTask>
62-
<Message Text="Using these test assemblies:"/>
63-
<Message Text="%(XUnitTests.Identity)"/>
64-
<Message Text="Total: @(XunitTests->Count())"/>
65-
</Target>
6657

67-
<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
58+
<Target Name="InvokeXUnit">
6859
<Message Importance="high" Text="Running XUnit tests" />
6960
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
7061

71-
<xunit
72-
Assemblies="@(XUnitTests)"
62+
<xunit
63+
Assemblies="@(XUnitTests)"
7364
AppDomains="true"
7465
ShadowCopy="false"
7566
ParallelizeTestCollections="false"
@@ -78,16 +69,16 @@
7869
Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
7970
MaxParallelThreads="10"
8071
DiagnosticMessages="false"
81-
ContinueOnError="false"
72+
ContinueOnError="false"
8273
Condition=" @(XUnitTests) != '' "/>
8374
</Target>
8475

85-
<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
76+
<Target Name="InvokeXUnitAll">
8677
<Message Importance="high" Text="Running XUnit tests" />
8778
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
8879

89-
<xunit
90-
Assemblies="@(XUnitTests)"
80+
<xunit
81+
Assemblies="@(XUnitTests)"
9182
AppDomains="true"
9283
ShadowCopy="false"
9384
ParallelizeTestCollections="false"
@@ -96,7 +87,7 @@
9687
Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
9788
MaxParallelThreads="10"
9889
DiagnosticMessages="false"
99-
ContinueOnError="false"
90+
ContinueOnError="false"
10091
Condition=" @(XUnitTests) != '' "/>
10192
</Target>
10293

@@ -107,7 +98,7 @@
10798
<Target Name="BeforeRunTests">
10899
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
109100
</Target>
110-
101+
111102
<Target Name="TestManagement">
112103
<Xunit.Runner.MSBuild.xunit Assemblies="$(ManagementTestDebug)" Html="$(TestOutputDirectory)\ManagementDebug.xunit.dll.html" Verbose="false"
113104
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
@@ -258,15 +249,15 @@
258249
<Message Importance="high" Text="Running Sql tests" />
259250
<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
260251
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
261-
</Target>
252+
</Target>
262253

263254
<!-- Run the KeyVault tests -->
264255
<Target Name="KeyVaultTests">
265256
<Message Importance="high" Text="Running KeyVault tests" />
266257
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
267258
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
268259
</Target>
269-
260+
270261
<!-- Run the ServiceFabric tests -->
271262
<Target Name="ServiceFabricTests">
272263
<Message Importance="high" Text="Running ServiceFabric tests" />
@@ -300,7 +291,7 @@
300291
<Message Importance="high" Text="Running UsageAggregates tests" />
301292
<Xunit.Runner.MSBuild.xunit Assemblies="$(UsageAggregationTestDebug)" Html="$(TestOutputDirectory)\UsageAggregationTests.xunit.dll.html" Verbose="true"
302293
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
303-
</Target>
294+
</Target>
304295

305296
<!-- Run the scenario tests with Mocks -->
306297
<Target Name="MockedScenarioTests">
@@ -462,10 +453,10 @@
462453
</Target>
463454

464455
<ItemGroup>
465-
<LiveTestDlls Include="$(ResourceManagerTestDebug)" />
456+
<LiveTestDlls Include="$(ResourceManagerTestDebug)" />
466457
</ItemGroup>
467458

468-
<Target Name="LiveTests">
459+
<Target Name="LiveTests">
469460
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
470461
<Exec Command="packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
471462
</Target>

‎ChangeLog.md‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1-
## 6.1.1 - May 2018
1+
## 6.2.0 - June 2018
2+
#### AzureRM.Profile
3+
* Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import
4+
5+
#### AzureRM.Compute
6+
* VMSS VM Update feature
7+
- Added 'Update-AzureRmVmssVM' and 'New-AzureRmVMDataDisk' cmdlets
8+
- Add VirtualMachineScaleSetVM parameter to 'Add-AzureRmVMDataDisk' cmdlet to support adding a data disk to Vmss VM.
9+
10+
#### AzureRM.DataFactoryV2
11+
* Updated the ADF .Net SDK version to 0.8.0-preview containing following changes:
12+
- Added Configure factory repository operation
13+
- Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties
14+
- Updated Several model types from SecretBase to Object
15+
- Added Blob Events trigger
16+
17+
### AzureRM.KeyVault
18+
* Update documentation with example output
19+
20+
### AzureRM.Network
21+
* Enable Traffic Analytics parameters on Network Watcher cmdlets
22+
23+
#### AzureRM.Resources
24+
* Fix issue with 'Properties' property of 'PSResource' object(s) returned from 'Get-AzureRmResource'
25+
26+
#### AzureRM.Scheduler
27+
* Fix issue with update ServiceBusQueueJob not setting new Auth values
28+
29+
### AzureRM.Sql
30+
* Updated the following cmdlets with optional LicenseType parameter
31+
- New-AzureRmSqlDatabase; Set-AzureRmSqlDatabase
32+
- New-AzureRmSqlElasticPool; Set-AzureRmSqlElasticPool
33+
- New-AzureRmSqlDatabaseCopy
34+
- New-AzureRmSqlDatabaseSecondary
35+
- Restore-AzureRmSqlDatabase
36+
37+
#### AzureRM.Websites
38+
* 'New-AzureRMWebApp' is updated to use common algorithms from the Strategy library.
39+
40+
## 6.1.1 - May 2018
241
#### AzureRM.Resources
342
* Revert change to `New-AzureRmADServicePrincipal` that gave service principals `Contributor` permissions over the current subscription if no values were provided for the `Role` or `Scope` parameters
443
- If no values are provided for `Role` or `Scope`, the service principal is created with no permissions

‎ModuleMappings.json‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
{
2+
".github": [],
3+
"documentation": [],
4+
"setup": [],
5+
".gitattributes": [],
6+
"CONTRIBUTING.md": [],
7+
"ChangeLog.md": [],
8+
"LICENSE.txt": [],
9+
"README.md": [],
10+
"appveyor.yml": [],
11+
"src/Common/": [],
12+
"src/ResourceManager/Common": [],
13+
"src/ResourceManager/Aks/": [
14+
"AzureRM.Aks"
15+
],
16+
"src/ResourceManager/AnalysisServices/": [
17+
"AzureRM.AnalysisServices",
18+
"Azure.AnalysisServices"
19+
],
20+
"src/ResourceManager/ApiManagement/": [
21+
"AzureRM.ApiManagement"
22+
],
23+
"src/ResourceManager/ApplicationInsights/": [
24+
"AzureRM.ApplicationInsights"
25+
],
26+
"src/ResourceManager/Automation/": [
27+
"AzureRM.Automation"
28+
],
29+
"src/ResourceManager/AzureBackup/": [
30+
"AzureRM.Backup"
31+
],
32+
"src/ResourceManager/AzureBatch/": [
33+
"AzureRM.Batch"
34+
],
35+
"src/ResourceManager/Billing/": [
36+
"AzureRM.Billing"
37+
],
38+
"src/ResourceManager/Cdn/": [
39+
"AzureRM.Cdn"
40+
],
41+
"src/ResourceManager/CognitiveServices/": [
42+
"AzureRM.CognitiveServices"
43+
],
44+
"src/ResourceManager/Compute/": [
45+
"AzureRM.Compute"
46+
],
47+
"src/ResourceManager/Consumption/": [
48+
"AzureRM.Consumption"
49+
],
50+
"src/ResourceManager/ContainerInstance/": [
51+
"AzureRM.ContainerInstance"
52+
],
53+
"src/ResourceManager/ContainerRegistry/": [
54+
"AzureRM.ContainerRegistry"
55+
],
56+
"src/ResourceManager/DataFactories/": [
57+
"AzureRM.DataFactories"
58+
],
59+
"src/ResourceManager/DataFactoryV2/": [
60+
"AzureRM.DataFactoryV2"
61+
],
62+
"src/ResourceManager/DataLakeAnalytics/": [
63+
"AzureRM.DataLakeAnalytics"
64+
],
65+
"src/ResourceManager/DataLakeStore/": [
66+
"AzureRM.DataLakeStore"
67+
],
68+
"src/ResourceManager/DataMigration/": [
69+
"AzureRM.DataMigration"
70+
],
71+
"src/ResourceManager/DeviceProvisioningServices/": [
72+
"AzureRM.DeviceProvisioningServices"
73+
],
74+
"src/ResourceManager/DevTestLabs/": [
75+
"AzureRM.DevTestLabs"
76+
],
77+
"src/ResourceManager/Dns/": [
78+
"AzureRM.Dns"
79+
],
80+
"src/ResourceManager/EventGrid/": [
81+
"AzureRM.EventGrid"
82+
],
83+
"src/ResourceManager/EventHub/": [
84+
"AzureRM.EventHub"
85+
],
86+
"src/ResourceManager/HDInsight/": [
87+
"AzureRM.HDInsight"
88+
],
89+
"src/ResourceManager/Insights/": [
90+
"AzureRM.Insights"
91+
],
92+
"src/ResourceManager/IotHub/": [
93+
"AzureRM.IotHub"
94+
],
95+
"src/ResourceManager/KeyVault/": [
96+
"AzureRM.KeyVault"
97+
],
98+
"src/ResourceManager/LogicApp/": [
99+
"AzureRM.LogicApp"
100+
],
101+
"src/ResourceManager/MachineLearning/": [
102+
"AzureRM.MachineLearning"
103+
],
104+
"src/ResourceManager/MachineLearningCompute/" : [
105+
"AzureRM.MachineLearningCompute"
106+
],
107+
"src/ResourceManager/ManagedServiceIdentity/" : [
108+
"AzureRM.ManagedServiceIdentity"
109+
],
110+
"src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/": [
111+
"AzureRM.MarketplaceOrdering"
112+
],
113+
"src/ResourceManager/Media/": [
114+
"AzureRM.Media"
115+
],
116+
"src/ResourceManager/Network/": [
117+
"AzureRM.Network"
118+
],
119+
"src/ResourceManager/NotificationHubs /": [
120+
"AzureRM.NotificationHubs"
121+
],
122+
"src/ResourceManager/OperationalInsights/": [
123+
"AzureRM.OperationalInsights"
124+
],
125+
"src/ResourceManager/PolicyInsights/": [
126+
"AzureRM.PolicyInsights"
127+
],
128+
"src/ResourceManager/PowerBIEmbedded/": [
129+
"AzureRM.PowerBIEmbedded"
130+
],
131+
"src/ResourceManager/Profile/": [
132+
"AzureRM.Profile"
133+
],
134+
"src/ResourceManager/RecoveryServices.Backup/": [
135+
"AzureRM.RecoveryServices.Backup"
136+
],
137+
"src/ResourceManager/RecoveryServices/": [
138+
"AzureRM.RecoveryServices"
139+
],
140+
"src/ResourceManager/RedisCache/": [
141+
"AzureRM.RedisCache"
142+
],
143+
"src/ResourceManager/Relay/": [
144+
"AzureRM.Relay"
145+
],
146+
"src/ResourceManager/Reservations/": [
147+
"AzureRM.Reservations"
148+
],
149+
"src/ResourceManager/Resources/": [
150+
"AzureRM.Resources"
151+
],
152+
"src/ResourceManager/Scheduler/": [
153+
"AzureRM.Scheduler"
154+
],
155+
"src/ResourceManager/ServiceBus/": [
156+
"AzureRM.ServiceBus"
157+
],
158+
"src/ResourceManager/ServiceFabric/": [
159+
"AzureRM.ServiceFabric"
160+
],
161+
"src/ResourceManager/Sql/": [
162+
"AzureRM.Sql"
163+
],
164+
"src/ResourceManager/Storage/": [
165+
"AzureRM.Storage"
166+
],
167+
"src/ResourceManager/StreamAnalytics/": [
168+
"AzureRM.StreamAnalytics"
169+
],
170+
"src/ResourceManager/Subscription/": [
171+
"AzureRM.Subscription"
172+
],
173+
"src/ResourceManager/Tags/": [
174+
"AzureRM.Tags"
175+
],
176+
"src/ResourceManager/TrafficManager/": [
177+
"AzureRM.TrafficManager"
178+
],
179+
"src/ResourceManager/UsageAggregates/": [
180+
"AzureRM.UsageAggregates"
181+
],
182+
"src/ResourceManager/Websites/": [
183+
"AzureRM.Websites"
184+
],
185+
"src/ServiceManagement/": [
186+
"Azure"
187+
],
188+
"src/Storage/Commands.Storage/": [
189+
"Azure.Storage"
190+
],
191+
"tools/": [
192+
]
193+
}

‎TestMappings.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
"src/ResourceManager/ApplicationInsights/": [
2525
".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
26-
],
26+
],
2727
"src/ResourceManager/Automation/": [
2828
".\\src\\ResourceManager\\Automation\\Commands.Automation.Test\\bin\\Debug\\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"
2929
],
@@ -73,6 +73,9 @@
7373
"src/ResourceManager/DataMigration/": [
7474
".\\src\\ResourceManager\\DataMigration\\Commands.DataMigration.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataMigration.Test.dll"
7575
],
76+
"src/ResourceManager/DeviceProvisioningServices/": [
77+
".\\src\\ResourceManager\\DeviceProvisioningServices\\Commands.DeviceProvisioningServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.DeviceProvisioningServices.dll"
78+
],
7679
"src/ResourceManager/DevTestLabs/": [],
7780
"src/ResourceManager/Dns/": [
7881
".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll"
@@ -94,9 +97,6 @@
9497
"src/ResourceManager/IotHub/": [
9598
".\\src\\ResourceManager\\IotHub\\Commands.IotHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.IotHub.Test.dll"
9699
],
97-
"src/ResourceManager/DeviceProvisioningServices/": [
98-
".\\src\\ResourceManager\\DeviceProvisioningServices\\Commands.DeviceProvisioningServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.DeviceProvisioningServices.dll"
99-
],
100100
"src/ResourceManager/KeyVault/": [
101101
".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
102102
".\\src\\ResourceManager\\KeyVault\\Commands.KeyVault.Test\\bin\\Debug\\Microsoft.Azure.Commands.KeyVault.Test.dll",

0 commit comments

Comments
 (0)