Merge pull request Azure#6562 from Azure/release-2018-06-29

[6.4.0] Merge release --> master

Author: Maddie Clayton

.gitignore

@@ -26,6 +26,7 @@ app.config
 *.userprefs
 *.sln.docstates
 .vscode
+*.userosscache
 
 # Build results
 [Dd]ebug/
@@ -217,6 +218,8 @@ pingme.txt
 groupMapping*.json
 /tools/index.json
 /Package/index.json
+/tools/outputtypes.json
+/Package/outputtypes.json
 
 *.msi
 *.wixpdb

ChangeLog.md

@@ -70,6 +70,9 @@
     ],
     "src/ResourceManager/DeviceProvisioningServices/": [
       "AzureRM.DeviceProvisioningServices"
+    ],
+	"src/ResourceManager/DevSpaces/": [
+      "AzureRM.DevSpaces"
     ],
     "src/ResourceManager/DevTestLabs/": [
       "AzureRM.DevTestLabs"

ModuleMappings.json

@@ -156,7 +156,7 @@ If there is a feature you would like to see in Azure PowerShell, please use the
 
 If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](https://azure.github.io/guidelines/).
 
-More information about contributing to this repo can be found in [CONTRIBUTING md](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md) and the [Azure PowerShell Developer Guide](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide) folder.
+More information about contributing to this repo can be found in [CONTRIBUTING md](https://github.com/Azure/azure-powershell/blob/preview/CONTRIBUTING.md) and the [Azure PowerShell Developer Guide](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md) folder.
 
 ## Learn More
 

README.md

@@ -76,6 +76,9 @@
   "src/ResourceManager/DeviceProvisioningServices/": [
     ".\\src\\ResourceManager\\DeviceProvisioningServices\\Commands.DeviceProvisioningServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.DeviceProvisioningServices.dll"
   ],
+  "src/ResourceManager/DevSpaces/": [
+    ".\\src\\ResourceManager\\DevSpaces\\Commands.DevSpaces.Test\\bin\\Debug\\Microsoft.Azure.Commands.DevSpaces.Test.dll"
+  ],
   "src/ResourceManager/DevTestLabs/": [],
   "src/ResourceManager/Dns/": [
     ".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll"

TestMappings.json

@@ -42,7 +42,7 @@ _Note_: Sometimes the error listed in the .csv file can be a false positive (for
 We take breaking changes very seriously, so please be mindful about the violations that you suppress in our repo.
 
 ### Signature Issues
-Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check [this page](https://github.com/Azure/azure-powershell/wiki/PowerShell-Cmdlet-Design-Guidelines) to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
+Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check [this page](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-design-guidelines.md) to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
 
 - Download the `SignatureIssues.csv` file from the Jenkins build
 - Open the file using a text editor (such as VS Code) and copy each of the errors you'd like to suppress

build.proj

@@ -237,8 +237,8 @@ Breaking changes in the cmdlet : Get-SomeObjectA
 
 #### The output return type is changing
 ```cs
-[CmdletOutputBreakingChange(typeof(List<Foo>), ReplacementCmdletOutputTypeName = "Dictionary<String, Foo>")]
-[Cmdlet(VerbsCommon.Get, "SomeObjectA"), OutputType(typeof(List<Foo>))]
+[CmdletOutputBreakingChange(typeof(Foo), ReplacementCmdletOutputTypeName = "Dictionary<String, Foo>")]
+[Cmdlet(VerbsCommon.Get, "SomeObjectA"), OutputType(typeof(Foo))]
 public class GetSomeObjectA : AzureRMCmdlet
 {
     protected override void BeginProcessing()

documentation/Debugging-StaticAnalysis-Errors.md

@@ -300,7 +300,7 @@ When the type of the output is a generic, and one of the arguments of the generi
 For example, if we had a cmdlet `Get-SomeObject` that returned a list of `Foo` objects
 
 ```cs
-[Cmdlet(VerbsCommon.Get, "SomeObject"), OutputType(typeof(List<Foo>))]
+[Cmdlet(VerbsCommon.Get, "SomeObject"), OutputType(typeof(Foo))]
 public class GetSomeObject : Cmdlet
 {
     protected override void BeginProcessing()
@@ -313,7 +313,7 @@ public class GetSomeObject : Cmdlet
 but it now returns a list of `Bar` objects
 
 ```cs
-[Cmdlet(VerbsCommon.Get, "SomeObject"), OutputType(typeof(List<Bar>))]
+[Cmdlet(VerbsCommon.Get, "SomeObject"), OutputType(typeof(Bar))]
 ```
 
 the following script will no longer work since we are accessing properties of the `Foo` object that may not be a part of the `Bar` object 

documentation/breaking-changes/breaking-changes-attribute-help.md

@@ -136,12 +136,20 @@ namespace Microsoft.WindowsAzure.Commands.Common.Attributes
         All = Table | List,
     }
 
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = true)]
     public sealed class Ps1XmlAttribute : Attribute
     {
         public string Label { get; set; }
 
         public ViewControl Target { get; set; } = ViewControl.Table;
+
+        public string ScriptBlock { get; set; }
+
+        public bool GroupByThis { get; set; }
+
+        public uint TableColumnWidth { get; set; }
+
+        public uint Position { get; set; } = Ps1XmlConstants.DefaultPosition;
     }
 }
 
@@ -151,6 +159,8 @@ With the attribute you can specify for a public property (or field) a target vie
 
 # Ps1XmlAttribute attribute usage.
 
+## Properties of primitive types.
+
 Let's say for our example we want to only show these parameters in the output:
 * Id
 * Name
@@ -215,6 +225,87 @@ namespace Microsoft.Azure.Commands.Profile.Models
 
 * Since the **Ps1Xml attribute** definition is located in the [Commands.Common](https://github.com/Azure/azure-powershell/tree/preview/src/Common/Commands.Common) project and the Command.Common project is likely referenced from your project - to make the attribute visible - you only need to add ```using Microsoft.WindowsAzure.Commands.Common.Attributes;``` statement.
 
+## Properties of complex types.
+
+If you have a property of a complex type, for example, Account of type IAzureAccount:
+```Cs
+    public class PSAzureContext : IAzureContext
+    {
+        // code omitted for brevity
+
+        public IAzureAccount Account { get; set; }
+
+        // code omitted for brevity
+    }
+
+```
+where the IAzureAccount type has its own properties :
+
+```Cs
+    public interface IAzureAccount : IExtensibleModel
+    {
+        string Id { get; set; }
+
+        string Credential { get; set; }
+
+        string Type { get; set; }
+
+        IDictionary<string, string> TenantMap { get; }
+    }
+```
+
+To specify what goes into the table view - use the **ScriptBlock** attribute property. You can use as many attributes as you need to specify all desired complex type properties: 
+```Cs
+    public class PSAzureContext : IAzureContext
+    {
+        // code omitted for brevity
+
+        [Ps1Xml(Label = "Account Id", Target = ViewControl.Table, ScriptBlock = "$_.Account.Id")]
+        [Ps1Xml(Label = "Account Type", Target = ViewControl.Table, ScriptBlock = "$_.Account.Type")]
+        public IAzureAccount Account { get; set; }
+
+        // code omitted for brevity
+    }
+
+```
+Note: **$_** symbol in PowerShell means the same as **this** key word means in C#. 
+
+These two attribute will result in 2 column in the table view:
+```Ps
+    Account Id  Account Type
+    ==========  ============
+```
+## GroupBy a property.
+
+If you need to group by a property - use the **GroupByThis** attribute property like this:
+```Cs
+public class PSAzureSubscription : IAzureSubscription
+{
+
+// code omitted for brevity
+
+    [Ps1Xml(Label = "Subscription Id", Target = ViewControl.Table, GroupByThis = true)]
+    public string Id { get; set; }
+
+// code omitted for brevity 
+``` 
+## Column order.
+
+The column order in the output table will be the same as the order of the properties in the class. If you need to change this behavior - use the **Position** (zero-based) attribute property like this:
+```Cs
+public class PSAzureSubscription : IAzureSubscription
+{
+
+// code omitted for brevity
+
+    [Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table, Position = 0)]
+    public string Name { get; set; }
+
+// code omitted for brevity 
+``` 
+
+This will place the column at the very beginning of the table.
+
 
 # How to generate format.ps1xml file.
 

documentation/breaking-changes/breaking-changes-tool-help.md

@@ -134,7 +134,7 @@ git config --global user.email "<Your email on GitHub>"
 ```
 git config --global user.name "<Your name>"
 ```
-Next, you will need to follow the steps [here](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#environment-setup) to set up your local fork of Azure/azure-powershell.
+Next, you will need to follow the steps [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#environment-setup) to set up your local fork of Azure/azure-powershell.
 
 # Building and Running Tests
-This image has been set up to build and run tests immediately. To build the project, run msbuild build.proj in the Developer Command Prompt for VS2015. Once this has completed, you can open your module in Visual Studio and start development there. To record tests, follow the instructions [here](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#recordingrunning-tests).
+This image has been set up to build and run tests immediately. To build the project, run msbuild build.proj in the Developer Command Prompt for VS2015. Once this has completed, you can open your module in Visual Studio and start development there. To record tests, follow the instructions [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#recordingrunning-tests).

documentation/development-docs/generate-format.ps1xml-file.md

@@ -0,0 +1,112 @@
+# Table of Contents
+1. [Summary](#summary)
+2. [Breaking changes in subscriptions module](#Breaking-changes-in-subscriptions-module)
+3. [Breaking changes in storage admin module](#Breaking-changes-in-storage-admin-module)
+
+## Summary
+The module version 1.3.0 of AzureStack brings in many breaking changes. Most of these breaking changes were noted with warnings in the previous releases. Please note that there are no changes in the AzureRM version of the module specific to Azure Stack.  
+
+AzureRm.AzureStackAdmin module is replaced with Azs.Subscriptions.Admin and Azs.Subscriptions module
+AzureRm.AzureStackStorage module is replaced with Azs.Storage.Admin module
+
+## Breaking changes in subscriptions module
+
+**Prefix Changes**<br>
+ The prefix *AzureRM* has been deprecated. We have been printing warning that the prefix *AzureRm* will be replaced with *Azs*. We replaced the AzureRm prefix with Azs in the last release with alias support. Now prefix *AzureRm* has been deprecated.The following are the changes. 
+   - *-AzureRmOffer is replaced with *-AzsOffer
+   - *-AzureRmManagedOffer is replaced with *-AzsManagedOffer
+   - *-AzureRmPlan is replaced with *-AzsPlan
+   - *-AzureRmMangedSubscription is replaced with *-AzsUserSubscription
+   - *-AzureRMTenantSubscription is replaced with *-AzsSubscription
+   - *-AzureRmManagedLocation is replaced with *-AzsLocation
+
+**Deprecated Cmdlets**
+
+- ```Get-AzureStackToken``` is deprecated. If there is a need to get token, please use the Microsoft.IdentityModel.Clients.ActiveDirectory.dll directly.
+
+- The cmdlets ```*-AzsReourceProviderManifest``` and ```*-AzsUsageConnection``` are deprecated
+For any of these usages, template based resource creation is preferred.  For deletion of these resources, deleting the whole resource group is preferred. If needed, you can also use generic cmdlet *-AzureRmResource
+
+**Parameter Changes**<br>
+The previous release was printing  warnings about the deprecation of the following parameter aliases and they are deprecated now. 
+- Parameter alias ```PlanName``` has been deprecated in favor of ```Name``` in Plan cmdlets
+- Parameter alias ```OfferName``` has been deprecated in favor of ```Name``` in Offer cmdlets
+- Parameter alias ```ResourceGroup``` has been deprecated in favor of ```ResourceGroupName``` in all the cmdlets
+- Parameter ```Managed``` in Get-AzsPlan has been deprecated. It was not used before
+- Parameter ```Managed``` in Get-AzsOffer has been deprecated. Please use Get-AzsManagedOffer instead
+
+**Flattening of Properties** <br>
+Properties field of the objects Plan, Offer, Subscription have been removed and the child properties are moved to the top level. If you are having any references to the Properties, this breaking change could be fixed by removing the intermediate Properties reference
+
+**Force Parameter** <br>
+
+Remove-* cmdlets will ask for confirmation before doing the remove action. Please use -Force to avoid the confirmation. The following are the affected cmldets
+- Remove-AzsOffer
+- Remove-AzsPlan
+- Remove-AzsUserSubscription
+- Remove-AzsSubscription
+
+<br>
+
+## Breaking Changes in Storage Admin Module
+
+**Globally Removed Parameters**<br>
+The parameters ```SkipCertificateValidation``` and ```DefaultProfile``` have been removed from all cmdlets.
+
+The parameters ```TimeGrain```, ```StartTimeInUtc```, ```EndTimInUtc```, ```MetricNames```, ```DetailedOutput```  have been removed for Get-Azs*Metric Cmdlets, please replace with Where-Object and Select-Object.
+
+The pareamters ```MetricNames```, ```DetailedOutput```  have been removed for Get-Azs*MetricDefinition Cmdlets, please replace with Where-Object and Select-Object
+
+**New Parameters**
+- The parameter ```ResourceGroupName``` is now an optional for all cmdlets.
+- The parameter ```FarmName``` will be required for all Cmdlets that reference nested resources under a farm.  You can get the value using the following
+
+```powershell
+        (Get-AzsStorageFarm -ResourceGroupName $rgn).Name
+```
+Affected cmdlets
+- Get-AzsBlobService
+- Get-AzsBlobServiceMetric
+- Get-AzsBlobServiceMetricDefinition
+- Get-AzsStorageFarmMetric
+- Get-AzsStorageFarmMetricDefinition
+- Get-AzsStorageShare
+- Get-AzsStorageShareMetric
+- Get-AzsStorageShareMetricDefinition
+- Get-AzsTableService
+- Get-AzsTableServiceMetric
+- Get-AzsTableServiceMetricDefinition
+- Start-AzsReclaimStorageCapacity
+
+ ```ResourceId``` parameter can be used for cmdlets that require ```Name``` . The ReourceId is same as the Id of the resource object that is returned from the Get-* cmdlets. The parameter also has an alias ```Id```. 
+
+Affected cmdlets<br>
+- Get-AzsStorageQuota
+- Get-AzsStorageShare
+- Remove-AzsStorageQuota
+- Set-AzsStorageQuota
+- Stop-AzsContainerMigration
+- Restore-AzsStorageAccount 
+
+
+**Get-AzsStorageAccount**<br>
+
+The parameters ```TenantSubscriptionId```, ```PartialAccountName```, ```StorageAccountStatus``` and ```Detail``` has been removed.  A new parameter called ```Summary``` has been added.
+
+**Get-AzsStorageAcquisition**<br>
+The parameters ```TenantSubscriptionId```, ```AccountName```, ```Container```, and ```Detail``` has been removed.  A new parameter called ```Filter``` has been added, this is an ODATA filter.
+
+**Get-AzsStorageContainer**<br>
+The parameter ```Intent``` has been removed and Count has been renamed to MaxCount.
+
+**Get-AzsStorageShare**<br>
+The parameter ```SourceShareName```  has been replaced with ```FarmName```. The parameter ```Intent``` has been removed.
+
+**Start-AzsStorageContainerMigration**<br>
+The parameter ```ContainerToMigrate``` is renamed to ```ContainerName```.  The parameters ```StorageAccountName```, ```ShareName``` and ```FarmName``` have been added.
+
+**Stop-AzsStorageContainerMigration**<br>
+This cmdlet has been renamed to ```Stop-AzsContainerMigration```
+
+**Undo-AzsDeletedStorageAccount**<br>
+This cmdlet has been renamed to Restore-AzsStorageAccount. The parameters ```NewAccountName```, ```ResourceAdminApiVersion```, ```StorageAccountApiVersion```  have been deprecated.

documentation/development-docs/vm-for-partners.md

@@ -157,7 +157,7 @@ AZURE_TEST_MODE=Record
 
 ## Record or Playback Tests
 
-- [Run the tests](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#running-tests) and make sure that you got a generated `.json` file that matches the test name in the bin folder under the `SessionRecords` folder
+- [Run the tests](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/azure-powershell-developer-guide.md#recordingrunning-tests) and make sure that you got a generated `.json` file that matches the test name in the bin folder under the `SessionRecords` folder
 - Copy the `SessionRecords` folder inside the test project and add all `*.json` files in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
 - To assure that the records work fine, delete the connection string (default mode is Playback mode) OR change HttpRecorderMode within the connection string to "Playback" and run the tests
 

documentation/migration-guides/Stack/migration-guide.1.3.0.md

@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
+  
+   <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AssemblyName>Microsoft.Azure.Commands.Common.Aks</AssemblyName>
+    <RootNamespace>Microsoft.Azure.Commands.Common.Aks</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+	<DelaySign>false</DelaySign>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+     <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Commands.Common\Common.Netcore.csproj" />
+    <ProjectReference Include="..\..\ResourceManager\Common\Commands.ResourceManager.Common\Common.ResourceManager.Netcore.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>true</DesignTime>
+      <AutoGen>true</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+
+</Project>