Skip to content

Release 6.2.0 merge #5

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.

Sign up for GitHub

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 33 commits into from
Jun 5, 2018
Merged

Release 6.2.0 merge #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8b61bc8
Fix for #4965,
praries880 May 22, 2018
41fd1c7
Add invocation name to the telemetry
praries880 May 22, 2018
fdbcfb6
Took care of review comments
praries880 May 23, 2018
f0eac80
Fix typo
praries880 May 23, 2018
51448db
Fix indentation
praries880 May 24, 2018
49e3cb7
Split StaticAnalysis exception files into separate files per module
cormacpayne May 25, 2018
7f01e55
Merge branch 'preview' of github.com:Azure/azure-powershell into exce…
cormacpayne May 29, 2018
0b6950f
Resolve review feedback and fix on-demand failure
cormacpayne May 29, 2018
8f3b381
Merge branch 'preview' into update_telemetry
praries880 May 29, 2018
79ba04d
versioning changes
May 29, 2018
c118082
fixes
May 30, 2018
e86eed6
Fix the issue that AdalConfiguration can't create from real value of …
blueww May 30, 2018
bd1f44b
Update KeyVault documentation (#6308)
May 30, 2018
2e56ab0
Updating pool and database cmdlets to include optional LicenseType pa…
johnpaulkee May 30, 2018
79cb7dd
Create generic task filter and apply to tests, help, and StaticAnalys…
cormacpayne May 30, 2018
d38f327
Merge branch 'preview' of https://github.com/Azure/azure-powershell i…
May 30, 2018
296852c
fix merge conflict
May 30, 2018
c0fb1f9
Remove Default sku setting from NewAzureVirtualNetworkGateway command…
ritwikbasu May 30, 2018
416fe57
Merge preview into network branch (#6290)
May 24, 2018
3cde187
Powershell changes to onboard additional traffic analytics parameters…
sayghosh May 24, 2018
bd69cc2
Merge pull request #6298 from cormacpayne/exceptions-refactor
May 30, 2018
fd20fba
Merge pull request #6274 from praries880/update_telemetry
praries880 May 30, 2018
bdd5152
Fix issue with example
danstis May 31, 2018
4d7399a
Updated SDK version, dropped extra items
EvgenyAgafonchikov May 28, 2018
5bcd332
merge
May 31, 2018
a9bc0f9
Merge pull request #6348 from danstis/patch-1
May 31, 2018
1a065bb
Merge pull request #6351 from EvgenyAgafonchikov/Network-2018-05-01-v2
May 31, 2018
942ac11
update version of remaining modules
May 31, 2018
4d6ec97
Merge pull request #6330 from maddieclayton/versioning
Jun 1, 2018
7a02a28
Merge branch 'NetCoreTestProjects' into release-6.2.0
MiYanni Jun 4, 2018
77be635
Fixing a few merge issues that occurred. Allows the Network tests to …
MiYanni Jun 4, 2018
b387a36
Updated Network management versions that were missed for netcore.
MiYanni Jun 4, 2018
71700b3
Readded classic (obsolete) calls for DataLakeAnalytics in desktop so …
MiYanni Jun 5, 2018
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
  •  
  •  
  •  
37 changes: 14 additions & 23 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,13 @@
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
ContinueOnError="false" />
</Target>
<Target Name="DeclareXunitTests">
<!--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.-->
<SmartTestingTask RepositoryOwner="Azure" RepositoryName="azure-powershell" PullRequestNumber="$(PullRequestNumber)" MapFilePath=".\TestMappings.json">
<Output TaskParameter ="TestAssemblies" ItemName="XUnitTests"/>
</SmartTestingTask>
<Message Text="Using these test assemblies:"/>
<Message Text="%(XUnitTests.Identity)"/>
<Message Text="Total: @(XunitTests->Count())"/>
</Target>

<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
<Target Name="InvokeXUnit">
<Message Importance="high" Text="Running XUnit tests" />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />

<xunit
Assemblies="@(XUnitTests)"
<xunit
Assemblies="@(XUnitTests)"
AppDomains="true"
ShadowCopy="false"
ParallelizeTestCollections="false"
Expand All @@ -78,16 +69,16 @@
Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
MaxParallelThreads="10"
DiagnosticMessages="false"
ContinueOnError="false"
ContinueOnError="false"
Condition=" @(XUnitTests) != '' "/>
</Target>

<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
<Target Name="InvokeXUnitAll">
<Message Importance="high" Text="Running XUnit tests" />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />

<xunit
Assemblies="@(XUnitTests)"
<xunit
Assemblies="@(XUnitTests)"
AppDomains="true"
ShadowCopy="false"
ParallelizeTestCollections="false"
Expand All @@ -96,7 +87,7 @@
Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
MaxParallelThreads="10"
DiagnosticMessages="false"
ContinueOnError="false"
ContinueOnError="false"
Condition=" @(XUnitTests) != '' "/>
</Target>

Expand All @@ -107,7 +98,7 @@
<Target Name="BeforeRunTests">
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
</Target>

<Target Name="TestManagement">
<Xunit.Runner.MSBuild.xunit Assemblies="$(ManagementTestDebug)" Html="$(TestOutputDirectory)\ManagementDebug.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
Expand Down Expand Up @@ -258,15 +249,15 @@
<Message Importance="high" Text="Running Sql tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>
</Target>

<!-- Run the KeyVault tests -->
<Target Name="KeyVaultTests">
<Message Importance="high" Text="Running KeyVault tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>

<!-- Run the ServiceFabric tests -->
<Target Name="ServiceFabricTests">
<Message Importance="high" Text="Running ServiceFabric tests" />
Expand Down Expand Up @@ -300,7 +291,7 @@
<Message Importance="high" Text="Running UsageAggregates tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(UsageAggregationTestDebug)" Html="$(TestOutputDirectory)\UsageAggregationTests.xunit.dll.html" Verbose="true"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>
</Target>

<!-- Run the scenario tests with Mocks -->
<Target Name="MockedScenarioTests">
Expand Down Expand Up @@ -462,10 +453,10 @@
</Target>

<ItemGroup>
<LiveTestDlls Include="$(ResourceManagerTestDebug)" />
<LiveTestDlls Include="$(ResourceManagerTestDebug)" />
</ItemGroup>

<Target Name="LiveTests">
<Target Name="LiveTests">
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
<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;" />
</Target>
Expand Down
41 changes: 40 additions & 1 deletion ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,43 @@
## 6.1.1 - May 2018
## 6.2.0 - June 2018
#### AzureRM.Profile
* Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import

#### AzureRM.Compute
* VMSS VM Update feature
- Added 'Update-AzureRmVmssVM' and 'New-AzureRmVMDataDisk' cmdlets
- Add VirtualMachineScaleSetVM parameter to 'Add-AzureRmVMDataDisk' cmdlet to support adding a data disk to Vmss VM.

#### AzureRM.DataFactoryV2
* Updated the ADF .Net SDK version to 0.8.0-preview containing following changes:
- Added Configure factory repository operation
- Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties
- Updated Several model types from SecretBase to Object
- Added Blob Events trigger

### AzureRM.KeyVault
* Update documentation with example output

### AzureRM.Network
* Enable Traffic Analytics parameters on Network Watcher cmdlets

#### AzureRM.Resources
* Fix issue with 'Properties' property of 'PSResource' object(s) returned from 'Get-AzureRmResource'

#### AzureRM.Scheduler
* Fix issue with update ServiceBusQueueJob not setting new Auth values

### AzureRM.Sql
* Updated the following cmdlets with optional LicenseType parameter
- New-AzureRmSqlDatabase; Set-AzureRmSqlDatabase
- New-AzureRmSqlElasticPool; Set-AzureRmSqlElasticPool
- New-AzureRmSqlDatabaseCopy
- New-AzureRmSqlDatabaseSecondary
- Restore-AzureRmSqlDatabase

#### AzureRM.Websites
* 'New-AzureRMWebApp' is updated to use common algorithms from the Strategy library.

## 6.1.1 - May 2018
#### AzureRM.Resources
* 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
- If no values are provided for `Role` or `Scope`, the service principal is created with no permissions
Expand Down
193 changes: 193 additions & 0 deletions ModuleMappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
{
".github": [],
"documentation": [],
"setup": [],
".gitattributes": [],
"CONTRIBUTING.md": [],
"ChangeLog.md": [],
"LICENSE.txt": [],
"README.md": [],
"appveyor.yml": [],
"src/Common/": [],
"src/ResourceManager/Common": [],
"src/ResourceManager/Aks/": [
"AzureRM.Aks"
],
"src/ResourceManager/AnalysisServices/": [
"AzureRM.AnalysisServices",
"Azure.AnalysisServices"
],
"src/ResourceManager/ApiManagement/": [
"AzureRM.ApiManagement"
],
"src/ResourceManager/ApplicationInsights/": [
"AzureRM.ApplicationInsights"
],
"src/ResourceManager/Automation/": [
"AzureRM.Automation"
],
"src/ResourceManager/AzureBackup/": [
"AzureRM.Backup"
],
"src/ResourceManager/AzureBatch/": [
"AzureRM.Batch"
],
"src/ResourceManager/Billing/": [
"AzureRM.Billing"
],
"src/ResourceManager/Cdn/": [
"AzureRM.Cdn"
],
"src/ResourceManager/CognitiveServices/": [
"AzureRM.CognitiveServices"
],
"src/ResourceManager/Compute/": [
"AzureRM.Compute"
],
"src/ResourceManager/Consumption/": [
"AzureRM.Consumption"
],
"src/ResourceManager/ContainerInstance/": [
"AzureRM.ContainerInstance"
],
"src/ResourceManager/ContainerRegistry/": [
"AzureRM.ContainerRegistry"
],
"src/ResourceManager/DataFactories/": [
"AzureRM.DataFactories"
],
"src/ResourceManager/DataFactoryV2/": [
"AzureRM.DataFactoryV2"
],
"src/ResourceManager/DataLakeAnalytics/": [
"AzureRM.DataLakeAnalytics"
],
"src/ResourceManager/DataLakeStore/": [
"AzureRM.DataLakeStore"
],
"src/ResourceManager/DataMigration/": [
"AzureRM.DataMigration"
],
"src/ResourceManager/DeviceProvisioningServices/": [
"AzureRM.DeviceProvisioningServices"
],
"src/ResourceManager/DevTestLabs/": [
"AzureRM.DevTestLabs"
],
"src/ResourceManager/Dns/": [
"AzureRM.Dns"
],
"src/ResourceManager/EventGrid/": [
"AzureRM.EventGrid"
],
"src/ResourceManager/EventHub/": [
"AzureRM.EventHub"
],
"src/ResourceManager/HDInsight/": [
"AzureRM.HDInsight"
],
"src/ResourceManager/Insights/": [
"AzureRM.Insights"
],
"src/ResourceManager/IotHub/": [
"AzureRM.IotHub"
],
"src/ResourceManager/KeyVault/": [
"AzureRM.KeyVault"
],
"src/ResourceManager/LogicApp/": [
"AzureRM.LogicApp"
],
"src/ResourceManager/MachineLearning/": [
"AzureRM.MachineLearning"
],
"src/ResourceManager/MachineLearningCompute/" : [
"AzureRM.MachineLearningCompute"
],
"src/ResourceManager/ManagedServiceIdentity/" : [
"AzureRM.ManagedServiceIdentity"
],
"src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/": [
"AzureRM.MarketplaceOrdering"
],
"src/ResourceManager/Media/": [
"AzureRM.Media"
],
"src/ResourceManager/Network/": [
"AzureRM.Network"
],
"src/ResourceManager/NotificationHubs /": [
"AzureRM.NotificationHubs"
],
"src/ResourceManager/OperationalInsights/": [
"AzureRM.OperationalInsights"
],
"src/ResourceManager/PolicyInsights/": [
"AzureRM.PolicyInsights"
],
"src/ResourceManager/PowerBIEmbedded/": [
"AzureRM.PowerBIEmbedded"
],
"src/ResourceManager/Profile/": [
"AzureRM.Profile"
],
"src/ResourceManager/RecoveryServices.Backup/": [
"AzureRM.RecoveryServices.Backup"
],
"src/ResourceManager/RecoveryServices/": [
"AzureRM.RecoveryServices"
],
"src/ResourceManager/RedisCache/": [
"AzureRM.RedisCache"
],
"src/ResourceManager/Relay/": [
"AzureRM.Relay"
],
"src/ResourceManager/Reservations/": [
"AzureRM.Reservations"
],
"src/ResourceManager/Resources/": [
"AzureRM.Resources"
],
"src/ResourceManager/Scheduler/": [
"AzureRM.Scheduler"
],
"src/ResourceManager/ServiceBus/": [
"AzureRM.ServiceBus"
],
"src/ResourceManager/ServiceFabric/": [
"AzureRM.ServiceFabric"
],
"src/ResourceManager/Sql/": [
"AzureRM.Sql"
],
"src/ResourceManager/Storage/": [
"AzureRM.Storage"
],
"src/ResourceManager/StreamAnalytics/": [
"AzureRM.StreamAnalytics"
],
"src/ResourceManager/Subscription/": [
"AzureRM.Subscription"
],
"src/ResourceManager/Tags/": [
"AzureRM.Tags"
],
"src/ResourceManager/TrafficManager/": [
"AzureRM.TrafficManager"
],
"src/ResourceManager/UsageAggregates/": [
"AzureRM.UsageAggregates"
],
"src/ResourceManager/Websites/": [
"AzureRM.Websites"
],
"src/ServiceManagement/": [
"Azure"
],
"src/Storage/Commands.Storage/": [
"Azure.Storage"
],
"tools/": [
]
}
8 changes: 4 additions & 4 deletions TestMappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"src/ResourceManager/ApplicationInsights/": [
".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
],
],
"src/ResourceManager/Automation/": [
".\\src\\ResourceManager\\Automation\\Commands.Automation.Test\\bin\\Debug\\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"
],
Expand Down Expand Up @@ -73,6 +73,9 @@
"src/ResourceManager/DataMigration/": [
".\\src\\ResourceManager\\DataMigration\\Commands.DataMigration.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataMigration.Test.dll"
],
"src/ResourceManager/DeviceProvisioningServices/": [
".\\src\\ResourceManager\\DeviceProvisioningServices\\Commands.DeviceProvisioningServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.DeviceProvisioningServices.dll"
],
"src/ResourceManager/DevTestLabs/": [],
"src/ResourceManager/Dns/": [
".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll"
Expand All @@ -94,9 +97,6 @@
"src/ResourceManager/IotHub/": [
".\\src\\ResourceManager\\IotHub\\Commands.IotHub.Test\\bin\\Debug\\Microsoft.Azure.Commands.IotHub.Test.dll"
],
"src/ResourceManager/DeviceProvisioningServices/": [
".\\src\\ResourceManager\\DeviceProvisioningServices\\Commands.DeviceProvisioningServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.DeviceProvisioningServices.dll"
],
"src/ResourceManager/KeyVault/": [
".\\src\\ResourceManager\\Compute\\Commands.Compute.Test\\bin\\Debug\\Microsoft.Azure.Commands.Compute.Test.dll",
".\\src\\ResourceManager\\KeyVault\\Commands.KeyVault.Test\\bin\\Debug\\Microsoft.Azure.Commands.KeyVault.Test.dll",
Expand Down
Loading