Merge pull request #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.