Merge preview into AzureRM.Storage.Location

.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,106 @@
-## 6.1.1 - May 2018
+## 6.3.0 - June 2018
+#### AzureRM.Profile
+* Updated error messages for Enable-AzureRmContextAutoSave
+* Create a context for each subscription when running 'Connect-AzureRmAccount' with no previous context
+
+#### Azure.Storage
+* Added additional information about -Permissions parameter in help files.
+
+#### AzureRM.Compute
+* 'Get-AzureRmVmDiskEncryptionStatus' fixes an issue observed for VMs with no data disks 
+* Update Compute client library version to fix following cmdlets
+    - Grant-AzureRmDiskAccess
+    - Grant-AzureRmSnapshotAccess
+    - Save-AzureRmVMImage
+* Fixed following cmdlets to show 'operation ID' and 'operation status' correctly:
+    - Start-AzureRmVM
+    - Stop-AzureRmVM
+    - Restart-AzureRmVM
+    - Set-AzureRmVM
+    - Remove-AzuerRmVM
+    - Set-AzureRmVmss
+    - Start-AzureRmVmssRollingOSUpgrade
+    - Stop-AzureRmVmssRollingUpgrade
+    - Start-AzureRmVmss
+    - Restart-AzureRmVmss
+    - Stop-AzureRmVmss
+    - Remove-AzureRmVmss
+    - ConvertTo-AzureRmVMManagedDisk
+    - Revoke-AzureRmSnapshotAccess
+    - Remove-AzureRmSnapshot
+    - Revoke-AzureRmDiskAccess
+    - Remove-AzureRmDisk
+    - Remove-AzureRmContainerService
+    - Remove-AzureRmAvailabilitySet
+
+#### AzureRM.EventGrid
+* Remove ValidateNotNullOrEmpty validation conditions for SubjectBeginsWith/SubjectEndsWith in Update-AzureRmEventGridSubscription cmdlet to allow changing these parameters to empty string if needed.
+
+#### AzureRM.KeyVault
+* Fix issue where no Tags are being returned when Get-AzureRmKeyVault -Tag is run
+
+#### AzureRM.PolicyInsights
+* Public release of Policy Insights cmdlets
+    - Use API version 2018-04-04
+    - Add PolicyDefinitionReferenceId to the results of Get-AzureRmPolicyStateSummary
+
+#### AzureRM.RecoveryServices.Backup
+* Added -Vault parameter to RecoveryServices.Backup cmdlets. When passed, this will override the Set-AzureRmRecoveryServicesContext cmdlet.
+
+#### AzureRM.Sql
+* Updated example in the help file for Get-AzureRmSqlDatabaseExpanded
+
+#### AzureRM.TrafficManager
+* Updated the help file for Add-AzureRmTrafficManagerEndpointConfig
+
+#### AzureRM.Websites
+* 'Set-AzureRmWebApp' is updated to not overwrite the AppSettings when using -AssignIdentity
+* 'New-AzureRmWebAppSlot' is updated to honor AppServicePlan as an optional parameter
+
+## 6.2.1 - June 2018
+### AzureRM.OperationalInsights
+* Updated PSWorkspace model to allow Network to use type as a parameter
+
+## 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