Merge branch 'preview' of github.com:/azure/azure-powershell into netcore-011

Author: markcowl

Azure.PowerShell.Netcore.sln

@@ -73,7 +73,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Consumption.Netcor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ContainerRegistry.Netcore", "src\ResourceManager\ContainerRegistry\Commands.ContainerRegistry\Commands.ContainerRegistry.Netcore.csproj", "{49A69011-CEFF-464B-AC2E-5A387EFFBE8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DataFactoryV2.Netcore", "src\ResourceManager\DataFactories\Commands.DataFactoryV2\Commands.DataFactoryV2.Netcore.csproj", "{EAC7B54E-974B-435F-95CE-B01CC2F955A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DataFactoryV2.Netcore", "src\ResourceManager\DataFactoryV2\Commands.DataFactoryV2\Commands.DataFactoryV2.Netcore.csproj", "{EAC7B54E-974B-435F-95CE-B01CC2F955A3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DataLakeAnalytics.Netcore", "src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics\Commands.DataLakeAnalytics.Netcore.csproj", "{CC0D2BA5-B087-4206-9F98-CD8230AADEF3}"
 EndProject

TestMappings.json

@@ -59,9 +59,11 @@
   ],
   "src/ResourceManager/DataFactories/": [
     ".\\src\\ResourceManager\\DataFactories\\Commands.DataFactories.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactories.Test.dll",
-    ".\\src\\ResourceManager\\DataFactories\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll",
     ".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
   ],
+  "src/ResourceManager/DataFactoryV2/": [
+    ".\\src\\ResourceManager\\DataFactoryV2\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll"
+  ],
   "src/ResourceManager/DataLakeAnalytics/": [
     ".\\src\\ResourceManager\\DataLakeAnalytics\\Commands.DataLakeAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"
   ],

build.proj

@@ -254,6 +254,7 @@
 
     <Message Importance="high" Text="Running Static Analyser" />
     <CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 &quot;" />
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
   </Target>
 

src/ResourceManager/Aks/AzureRM.Aks.psd1

@@ -54,9 +54,9 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\YamlDotNet.dll', 
-               '.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll', 
-               '.\AutoMapper.dll'
+RequiredAssemblies = '.\YamlDotNet.dll',
+	'.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll',
+	'.\AutoMapper.dll', '.\System.Management.Automation.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/ResourceManager/Compute.ManagedService/AzureRM.Compute.ManagedService.psd1

@@ -54,7 +54,8 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-# RequiredAssemblies = @()
+RequiredAssemblies = '.\Microsoft.Data.Edm.dll', '.\Microsoft.Data.OData.dll',
+              '.\Microsoft.Data.Services.Client.dll', '.\System.Spatial.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1

@@ -43,16 +43,13 @@ $ErrorActionPreference = "Stop"
 ########################################################################################################################
 # Section1:  Log-in to Azure and select appropriate subscription. 
 ########################################################################################################################
-  
 
     Select-AzureRmSubscription -SubscriptionId $subscriptionId;
 
-
 ########################################################################################################################
 # Section2:  Create AAD app . Fill in $aadClientSecret variable if AAD app was already created
 ########################################################################################################################
 
-
     # Check if AAD app with $aadAppName was already created
     $SvcPrincipals = (Get-AzureRmADServicePrincipal -SearchString $aadAppName);
     if(-not $SvcPrincipals)
@@ -187,7 +184,36 @@ $ErrorActionPreference = "Stop"
     Read-Host;
 
 ########################################################################################################################
-# For each VM you want to encrypt, run the below cmdlet
-#    $vmName = 'Name of VM to encrypt';
-#    Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $resourceGroupName -VMName $vmName -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -VolumeType All
+# To encrypt one VM in given resource group of the logged in subscritpion, assign $vmName and uncomment below section
+########################################################################################################################
+#$vmName = "Your VM Name";
+#$allVMs = Get-AzureRmVm -ResourceGroupName $resourceGroupName -Name $vmName;
+
+########################################################################################################################
+# To encrypt all the VMs in the given resource group of the logged in subscription uncomment below section
 ########################################################################################################################
+#$allVMs = Get-AzureRmVm -ResourceGroupName $resourceGroupName;
+
+########################################################################################################################
+# To encrypt all the VMs in the all the resource groups of the logged in subscription, uncomment below section
+########################################################################################################################
+#$allVMs = Get-AzureRmVm;
+
+########################################################################################################################
+# Loop through the selected list of VMs and enable encryption
+########################################################################################################################
+
+foreach($vm in $allVMs)
+{
+    Write-Host "Encrypting VM: $($vm.Name) in ResourceGroup: $($vm.ResourceGroupName) " -foregroundcolor Green;
+    if(-not $kek)
+    {
+        Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -VolumeType 'All';    
+    }
+    else
+    {
+        Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -VolumeType 'All';            
+    }
+    # Show encryption status of the VM
+    Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $vm.ResourceGroupName -VMName $vm.Name;
+}

src/ResourceManager/DataFactories/DataFactories.sln

@@ -10,10 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactories", "C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactories.Test", "Commands.DataFactories.Test\Commands.DataFactories.Test.csproj", "{D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactoryV2.Test", "Commands.DataFactoryV2.Test\Commands.DataFactoryV2.Test.csproj", "{8E5612F5-4F26-49CA-B9AC-67A4C1DB74F3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactoryV2", "Commands.DataFactoryV2\Commands.DataFactoryV2.csproj", "{26B676D3-E448-4FA5-A23C-C79E7753D280}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}"
@@ -60,14 +56,6 @@ Global
 		{D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E5612F5-4F26-49CA-B9AC-67A4C1DB74F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E5612F5-4F26-49CA-B9AC-67A4C1DB74F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E5612F5-4F26-49CA-B9AC-67A4C1DB74F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E5612F5-4F26-49CA-B9AC-67A4C1DB74F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26B676D3-E448-4FA5-A23C-C79E7753D280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26B676D3-E448-4FA5-A23C-C79E7753D280}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26B676D3-E448-4FA5-A23C-C79E7753D280}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26B676D3-E448-4FA5-A23C-C79E7753D280}.Release|Any CPU.Build.0 = Release|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -130,7 +118,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
-		{8E5612F5-4F26-49CA-B9AC-67A4C1DB74F3} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{CFF09E81-1E31-444E-B4D4-A21E946C29E2} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection

src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.Netcore.psd1 renamed to src/ResourceManager/DataFactoryV2/AzureRM.DataFactoryV2.Netcore.psd1

@@ -169,7 +169,6 @@
       <Link>AzureRM.DataFactoryV2.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Changelog.md" />
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config">
       <SubType>Designer</SubType>

src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.psd1 renamed to src/ResourceManager/DataFactoryV2/AzureRM.DataFactoryV2.psd1

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");