Merge Master to Preview

.gitignore

@@ -229,3 +229,6 @@ Package
 .idea
 /src/ResourceManager/RecoveryServices.Backup/**/bin
 launchSettings.json
+/src/StackAdmin/AzureRM/AzureRM.psm1
+/src/StackAdmin/AzureStack/AzureStack.psm1
+/tools/AzureRM.Netcore/AzureRM.Netcore.psm1

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: csharp
 mono: none
-dotnet: 2.1.2
+dotnet: 2.1.200
 dist: trusty
 
 env:
@@ -19,9 +19,11 @@ before_install:
  - sudo apt-get install -y powershell
  - sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"
 
+ # https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
 script:
- - dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG
- - dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter="AcceptanceType=CheckIn" --configuration $CONFIG
+ - sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
+ - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
+ - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
 
 after_success:
  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

AzurePowershell.Test.targets

@@ -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"
@@ -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"
@@ -96,7 +87,7 @@
 			Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
 			MaxParallelThreads="10"
 			DiagnosticMessages="false"
-			ContinueOnError="false" 
+			ContinueOnError="false"
 			Condition=" @(XUnitTests) != '' "/>
 	</Target>
 
@@ -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" />
@@ -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" />
@@ -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">
@@ -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>

ChangeLog.md

@@ -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

ModuleMappings.json

@@ -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/": [
+    ]
+  }