Skip to content

Commit 1452292

Browse files
cormacpaynecormacpayne
authored
Merge pull request #6657 from Azure/release-2018-07-13
[6.5.0] Merge release --> master
2 parents 0ea27fa + 4949481 commit 1452292

File tree

746 files changed

+110764
-4151682
lines changed

Some content is hidden

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

746 files changed

+110764
-4151682
lines changed

‎AzurePowershell.Test.targets

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,32 @@
5656
</Target>
5757

5858
<Target Name="InvokeXUnit">
59-
<Message Importance="high" Text="Running XUnit tests" />
60-
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
59+
<PropertyGroup> <!-- Create the file path for the test dll (src/TestResults/<dll name>.html -->
60+
<TestName>$(XUnitTests.Split('\').Length)</TestName>
61+
<TestNamePathLength>$([MSBuild]::Subtract($(TestName), 1))</TestNamePathLength>
62+
<TestSubFileName>$(XUnitTests.Split('\')[$(TestNamePathLength)])</TestSubFileName>
63+
<TestFileName>$(TestOutputDirectory)\$(TestSubFileName).html</TestFileName>
64+
</PropertyGroup>
65+
<Message Importance="high" Text="Running XUnit tests... $(TestFileName)" />
6166

6267
<xunit
63-
Assemblies="@(XUnitTests)"
68+
Assemblies="$(XUnitTests)"
6469
AppDomains="true"
6570
ShadowCopy="false"
6671
ParallelizeTestCollections="false"
67-
ParallelizeAssemblies="true"
72+
ParallelizeAssemblies="false"
6873
IncludeTraits="AcceptanceType=CheckIn"
69-
Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
70-
MaxParallelThreads="10"
74+
Html="$(TestFileName)"
7175
DiagnosticMessages="false"
72-
ContinueOnError="false"
73-
Condition=" @(XUnitTests) != '' "/>
76+
ContinueOnError="true"
77+
Condition=" $(XUnitTests) != '' ">
78+
<Output TaskParameter="ExitCode" ItemName="XUnitExitCode"/>
79+
</xunit>
80+
81+
82+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. Move-Item -Path $(TestOutputDirectory)/$(TestSubFileName).html -Destination $(TestOutputDirectory)/PassingTests/$(TestSubFileName).html &quot;" Condition="%(XUnitExitCode.Identity) == 0"/>
83+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. Move-Item -Path $(TestOutputDirectory)/$(TestSubFileName).html -Destination $(TestOutputDirectory)/FailingTests/$(TestSubFileName).html &quot;" Condition="%(XUnitExitCode.Identity) != 0"/>
84+
7485
</Target>
7586

7687
<Target Name="InvokeXUnitAll">
@@ -82,10 +93,9 @@
8293
AppDomains="true"
8394
ShadowCopy="false"
8495
ParallelizeTestCollections="false"
85-
ParallelizeAssemblies="true"
96+
ParallelizeAssemblies="false"
8697
ExcludeTraits="RunType=LiveOnly;AcceptanceType=CheckIn"
8798
Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
88-
MaxParallelThreads="10"
8999
DiagnosticMessages="false"
90100
ContinueOnError="false"
91101
Condition=" @(XUnitTests) != '' "/>

‎ChangeLog.md

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,76 @@
1-
## 6.4.0 - July 2018
1+
## 6.5.0 - July 2018
2+
#### AzureRM.Profile
3+
* Updated help for 'Get-AzureRmContextAutosaveSetting'
4+
5+
#### Azure.Storage
6+
* Support Upload Blob or File with write only Sas token
7+
- Set-AzureStorageBlobContent
8+
- Set-AzureStorageFileContent
9+
10+
#### AzureRM.AnalysisServices
11+
* Add required property ResourceGroupName to AS.
12+
13+
#### AzureRM.Automation
14+
* Update help and add example for 'New-AzureRMAutomationSchedule'
15+
16+
#### AzureRM.Compute
17+
* Add -Tag parameter to Update/New-AzureRmAvailabilitySet
18+
* Add example for 'Add-AzureRmVmssExtension'
19+
* Add examples for 'Remove-AzureRmVmssExtension'
20+
* Update help for 'Set-AzureRmVMAccessExtension'
21+
* Update SimpleParameterSet for New-AzureRmVmss to set SinglePlacementGroup to false by default and add switch parameter 'SinglePlacementGroup' that enables the user to create the VMSS in a single placement group.
22+
23+
#### AzureRM.EventHub
24+
* Added a readonly property 'PendingReplicationOperationsCount' to PSEventHubDRConfigurationAttributes class, which gives the pending replication operations count while replication is in progress
25+
26+
#### AzureRM.KeyVault
27+
* Update error message for Set-AzureRmKeyVaultAccessPolicy
28+
29+
#### AzureRM.LogicApp
30+
* Fixed "parameter set could not be resolved" error in New-AzureRmLogicApp
31+
32+
#### AzureRM.Network
33+
* Enable peering across Virtual Networks in multiple Tenants for Set/Add-AzureRmVirtualNetworkPeering
34+
* Updated below cmdlets for Application Gateway
35+
- New-AzureRmApplicationGateway : Added EnableFIPS flag and Zones support
36+
- New-AzureRmApplicationGatewaySku : Added new skus Standard_v2 and WAF_v2
37+
- Set-AzureRmApplicationGatewaySku : Added new skus Standard_v2 and WAF_v2
38+
* Regenerated RouteTable cmdlets with the latest generator version
39+
40+
#### AzureRM.Relay
41+
* Updated markdown files, fix for the parameter name issue in example
42+
43+
#### AzureRM.Resources
44+
* Update Roleassignment and roledefinition cmdlets:
45+
- Remove extra roledefinition calls done as part of paging.
46+
* Fix Get-AzureRmRoleAssignment cmdlet
47+
- Fix -ExpandPrincipalGroups command parameter functionality
48+
* Fix issue with 'Get-AzureRmResource' where '-ResourceType' parameter was case sensitive
49+
50+
#### AzureRM.ServiceBus
51+
* Added top and skip parameter to list cmdlets
52+
* Added Standard to Premium NameSpace migration cmdlets :
53+
- Start-AzureRmServiceBusMigration
54+
- Get-AzureRmServiceBusMigration
55+
- Complete-AzureRmServiceBusMigration
56+
- Stop-AzureRmServiceBusMigration
57+
- Remove-AzureRmServiceBusMigration
58+
* Added a readonly property 'PendingReplicationOperationsCount' to PSServiceBusDRConfigurationAttributes class, which gives the pending replication operations count while replication is in progress
59+
60+
#### AzureRM.ServiceFabric
61+
* Update example for 'New-AzureRmServiceFabricCluster'
62+
63+
#### AzureRM.Sql
64+
* Adding new Cmdlets for Management.Sql to allow customers to add TDE Certificate to Sql Server instance or a Managed Instance
65+
- Add-AzureRmSqlServerTransparentDataEncryptionCertificate
66+
- Add-AzureRmSqlManagedInstanceTransparentDataEncryptionCertificate
67+
68+
#### AzureRM.Websites
69+
* `Set-AzureRmWebApp -AssignIdentity` and `Set-AzureRmWebAppSlot -AssignIdentity` when set to false will now remove the Identity property from the site object.Removing preview tag as well.
70+
* `Get-AzureRmWebAppMetrics`,`Get-AzureRmAppServicePlanMetrics` example updated
71+
* `Set-AzureRmWebApp -PhpVersion` supports off as a valid php version
72+
73+
## 6.4.0 - July 2018
274
#### General
375
* Fixed formatting of OutputType in help files for most modules
476

‎TestMappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@
146146
".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
147147
".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"
148148
],
149+
"src/ResourceManager/RecoveryServices.SiteRecovery/": [
150+
".\\src\\ResourceManager\\RecoveryServices.SiteRecovery\\Commands.RecoveryServices.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.Test.dll"
151+
],
149152
"src/ResourceManager/RedisCache/": [
150153
".\\src\\ResourceManager\\RedisCache\\Commands.RedisCache.Test\\bin\\Debug\\Microsoft.Azure.Commands.RedisCache.Test.dll"
151154
],

‎build.proj

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@
100100
<CmdletSolutionsToBuild Include=".\src\Stack.sln"
101101
Condition=" '$(Scope)' == 'All' or '$(Scope)' == 'Stack'"/>
102102

103+
<CommonSolution Include="$(LibrarySourceFolder)\Common\Common.sln" />
103104
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
104105
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
105-
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
106+
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
106107
</ItemGroup>
107108

108109
<!-- Tasks -->
@@ -209,16 +210,18 @@
209210
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(LocalFeedFolder)&quot; $(NuGetRestoreConfigSwitch)"/>
210211
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
211212
<!-- Restore packages -->
213+
<Exec Command="$(NuGetCommand) restore %(CommonSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
214+
ContinueOnError="false" />
212215
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
213216
ContinueOnError="false" />
214217
<!-- Restore packages for static analysis-->
215218
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
216219
ContinueOnError="false" />
217220
<!-- Restore packages for local build tasks-->
218-
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetLocalBuildTaskPackages)"
221+
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
219222
ContinueOnError="false" />
220223
<!-- Restore packages for repo tasks tasks-->
221-
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRepoTasksPackages)"
224+
<Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
222225
ContinueOnError="false" />
223226
<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
224227
ContinueOnError="false" />
@@ -264,6 +267,13 @@
264267
<MakeDir Directories="$(StackPackageFolder)"
265268
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
266269

270+
<MSBuild
271+
Projects="@(CommonSolution)"
272+
Targets="Build"
273+
Properties="Configuration=$(Configuration);Platform=Any CPU"
274+
BuildInParallel="$(BuildInParallel)"
275+
ContinueOnError="false" />
276+
267277
<MSBuild Projects="@(CmdletSolutionsToBuild)"
268278
Targets="Build"
269279
Properties="Configuration=$(Configuration);Platform=Any CPU"
@@ -642,11 +652,43 @@
642652
<Target Name="Test" DependsOnTargets="BeforeRunTests">
643653
<Message Importance="high" Text="Running check in tests..." />
644654

655+
<CallTarget Targets="BinScopeCheck" />
656+
657+
<CallTarget Targets="RunPoliCheck" />
658+
645659
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\Modules\Run-UnitTests.ps1 -BuildConfig $(Configuration) -Scope $(Scope) &quot;"
646660
ContinueOnError="ErrorAndContinue"/>
647661

648662
<!-- Azure / Stack -->
649-
<CallTarget Targets="InvokeXUnit" />
663+
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
664+
<MakeDir Directories="$(TestOutputDirectory)/PassingTests" ContinueOnError="false" />
665+
<MakeDir Directories="$(TestOutputDirectory)/FailingTests" ContinueOnError="false" />
666+
<MSBuild Projects="build.proj"
667+
Targets="InvokeXUnit"
668+
Properties="XUnitTests=%(XUnitTests.Identity);TestOutputDirectory=$(TestOutputDirectory)"
669+
ContinueOnError="false" />
670+
671+
<CallTarget Targets="TestFailureCheck" />
672+
</Target>
673+
674+
<Target Name="BinScopeCheck">
675+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\CheckBinScope.ps1 -BuildConfig $(Configuration) -CIToolsPath $(CIToolsPath) &quot;"
676+
ContinueOnError="False"/>
677+
<OnError ExecuteTargets="BinScopeErrorMessage"/>
678+
</Target>
679+
680+
<Target Name="BinScopeErrorMessage">
681+
<Error Text="Binscope failed, please check the files in src/Package/BinScope"/>
682+
</Target>
683+
684+
<Target Name="TestFailureCheck">
685+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;if ((Get-ChildItem $(TestOutputDirectory)/FailingTests).Count -ge 1) { throw &quot;Failing tests, please check files in src/TestResults/FailingTests&quot; } &quot;"
686+
ContinueOnError="False"/>
687+
<OnError ExecuteTargets="TestFailureErrorMessage"/>
688+
</Target>
689+
690+
<Target Name="TestFailureErrorMessage">
691+
<Error Text="Test failures occured, check the files in src/TestResults/FailingTests."/>
650692
</Target>
651693

652694
<!-- Run Full switch with scenario tests -->
@@ -665,4 +707,14 @@
665707
<CallTarget Targets="LiveTests"/>
666708
</Target>
667709

710+
<Target Name="RunPoliCheck">
711+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\CheckPoliCheck.ps1 -BuildConfig $(Configuration) -CIToolsPath $(CIToolsPath) &quot;"
712+
ContinueOnError="False"/>
713+
<OnError ExecuteTargets="PoliCheckErrorMessage"/>
714+
</Target>
715+
716+
<Target Name="PoliCheckErrorMessage">
717+
<Error Text="PoliCheck failed with a Severity 1 issue, please check the report at in src/Package/PoliCheck-Scan.html"/>
718+
</Target>
719+
668720
</Project>

‎src/Common/Commands.Common.Authentication.Abstractions/Settings/AuthenticationFactorySettings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
2222
/// </summary>
2323
public class AuthenticationFactorySettings : IExtensibleSettings
2424
{
25+
public const string CommonAdTenant = "Common";
26+
2527
/// <summary>
2628
/// The default token cache used for the authentication factory
2729
/// </summary>

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class AzurePowerShell
2626

2727
public const string AssemblyCopyright = "Copyright © Microsoft";
2828

29-
public const string AssemblyVersion = "6.4.0";
29+
public const string AssemblyVersion = "6.5.0";
3030

31-
public const string AssemblyFileVersion = "6.4.0";
31+
public const string AssemblyFileVersion = "6.5.0";
3232

3333
public const string ProfileFile = "AzureProfile.json";
3434

0 commit comments

Comments
 (0)