diff --git a/.globalconfig b/.globalconfig
index f0cc41c388e..d0e15aed25a 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -1367,7 +1367,7 @@ dotnet_diagnostic.SA1502.severity = none
 dotnet_diagnostic.SA1503.severity = none
 
 # SA1504: All accessors should be single-line or multi-line
-dotnet_diagnostic.SA1504.severity = none
+dotnet_diagnostic.SA1504.severity = warning
 
 # SA1505: Opening braces should not be followed by blank line
 dotnet_diagnostic.SA1505.severity = none
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
index 306bb57e288..ea592b40b90 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
@@ -76,7 +76,10 @@ public GetCimAssociatedInstanceCommand()
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return CimInstance; }
+            get
+            {
+                return CimInstance;
+            }
 
             set
             {
@@ -118,7 +121,10 @@ public CimInstance InputObject
         [Parameter]
         public Uri ResourceUri
         {
-            get { return resourceUri; }
+            get
+            {
+                return resourceUri;
+            }
 
             set
             {
@@ -146,7 +152,10 @@ public Uri ResourceUri
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computerName; }
+            get
+            {
+                return computerName;
+            }
 
             set
             {
@@ -168,7 +177,10 @@ public string[] ComputerName
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public Microsoft.Management.Infrastructure.CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
index 0d9de236f05..a8befcc9bbb 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
@@ -92,7 +92,10 @@ public GetCimClassCommand()
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -118,7 +121,10 @@ public CimSession[] CimSession
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computerName; }
+            get
+            {
+                return computerName;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
index b2f00a0e624..c6bd956a5b3 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
@@ -63,7 +63,10 @@ public GetCimInstanceCommand()
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -90,7 +93,10 @@ public CimSession[] CimSession
                    ParameterSetName = CimBaseCommand.ClassNameComputerSet)]
         public string ClassName
         {
-            get { return className; }
+            get
+            {
+                return className;
+            }
 
             set
             {
@@ -125,7 +131,10 @@ public string ClassName
             ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public Uri ResourceUri
         {
-            get { return resourceUri; }
+            get
+            {
+                return resourceUri;
+            }
 
             set
             {
@@ -161,7 +170,10 @@ public Uri ResourceUri
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computerName; }
+            get
+            {
+                return computerName;
+            }
 
             set
             {
@@ -185,7 +197,10 @@ public string[] ComputerName
         [Parameter(ParameterSetName = CimBaseCommand.ResourceUriSessionSet)]
         public SwitchParameter KeyOnly
         {
-            get { return keyOnly; }
+            get
+            {
+                return keyOnly;
+            }
 
             set
             {
@@ -220,7 +235,10 @@ public SwitchParameter KeyOnly
             ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public string Namespace
         {
-            get { return nameSpace; }
+            get
+            {
+                return nameSpace;
+            }
 
             set
             {
@@ -270,7 +288,10 @@ public string Namespace
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return CimInstance; }
+            get
+            {
+                return CimInstance;
+            }
 
             set
             {
@@ -297,7 +318,10 @@ public CimInstance InputObject
                    ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public string Query
         {
-            get { return query; }
+            get
+            {
+                return query;
+            }
 
             set
             {
@@ -326,7 +350,10 @@ public string Query
 
         public string QueryDialect
         {
-            get { return queryDialect; }
+            get
+            {
+                return queryDialect;
+            }
 
             set
             {
@@ -354,7 +381,10 @@ public string QueryDialect
         [Parameter(ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public SwitchParameter Shallow
         {
-            get { return shallow; }
+            get
+            {
+                return shallow;
+            }
 
             set
             {
@@ -381,7 +411,10 @@ public SwitchParameter Shallow
                    ParameterSetName = CimBaseCommand.ResourceUriComputerSet)]
         public string Filter
         {
-            get { return filter; }
+            get
+            {
+                return filter;
+            }
 
             set
             {
@@ -410,7 +443,10 @@ public string Filter
         [Alias("SelectProperties")]
         public string[] Property
         {
-            get { return SelectProperties; }
+            get
+            {
+                return SelectProperties;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs
index 0be1b643f79..a402d58d0d3 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs
@@ -58,7 +58,10 @@ public GetCimSessionCommand()
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -80,7 +83,10 @@ public string[] ComputerName
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public UInt32[] Id
         {
-            get { return id; }
+            get
+            {
+                return id;
+            }
 
             set
             {
@@ -101,7 +107,10 @@ public UInt32[] Id
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public Guid[] InstanceId
         {
-            get { return instanceid; }
+            get
+            {
+                return instanceid;
+            }
 
             set
             {
@@ -123,7 +132,10 @@ public Guid[] InstanceId
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] Name
         {
-            get { return name; }
+            get
+            {
+                return name;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
index 4377aeacfa4..f920094ae15 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
@@ -54,7 +54,10 @@ public InvokeCimMethodCommand()
         [Alias("Class")]
         public string ClassName
         {
-            get { return className; }
+            get
+            {
+                return className;
+            }
 
             set
             {
@@ -83,7 +86,10 @@ public string ClassName
                    ParameterSetName = CimBaseCommand.ResourceUriSessionSet)]
         public Uri ResourceUri
         {
-            get { return resourceUri; }
+            get
+            {
+                return resourceUri;
+            }
 
             set
             {
@@ -108,7 +114,10 @@ public Uri ResourceUri
             ParameterSetName = CimClassSessionSet)]
         public CimClass CimClass
         {
-            get { return cimClass; }
+            get
+            {
+                return cimClass;
+            }
 
             set
             {
@@ -131,7 +140,10 @@ public CimClass CimClass
                    ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public string Query
         {
-            get { return query; }
+            get
+            {
+                return query;
+            }
 
             set
             {
@@ -155,7 +167,10 @@ public string Query
                    ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public string QueryDialect
         {
-            get { return queryDialect; }
+            get
+            {
+                return queryDialect;
+            }
 
             set
             {
@@ -182,7 +197,10 @@ public string QueryDialect
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return CimInstance; }
+            get
+            {
+                return CimInstance;
+            }
 
             set
             {
@@ -224,7 +242,10 @@ public CimInstance InputObject
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computerName; }
+            get
+            {
+                return computerName;
+            }
 
             set
             {
@@ -264,7 +285,10 @@ public string[] ComputerName
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -294,7 +318,10 @@ public CimSession[] CimSession
         [Alias("Name")]
         public string MethodName
         {
-            get { return methodName; }
+            get
+            {
+                return methodName;
+            }
 
             set
             {
@@ -325,7 +352,10 @@ public string MethodName
             ParameterSetName = CimBaseCommand.ResourceUriSessionSet)]
         public string Namespace
         {
-            get { return nameSpace; }
+            get
+            {
+                return nameSpace;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
index e3daf3e0ede..92f42d9a626 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
@@ -57,7 +57,10 @@ public NewCimInstanceCommand()
             ParameterSetName = CimBaseCommand.ClassNameComputerSet)]
         public string ClassName
         {
-            get { return className; }
+            get
+            {
+                return className;
+            }
 
             set
             {
@@ -82,7 +85,10 @@ public string ClassName
                    ParameterSetName = CimBaseCommand.ResourceUriComputerSet)]
         public Uri ResourceUri
         {
-            get { return resourceUri; }
+            get
+            {
+                return resourceUri;
+            }
 
             set
             {
@@ -117,7 +123,10 @@ public Uri ResourceUri
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] Key
         {
-            get { return key; }
+            get
+            {
+                return key;
+            }
 
             set
             {
@@ -144,7 +153,10 @@ public string[] Key
             ParameterSetName = CimClassComputerSet)]
         public CimClass CimClass
         {
-            get { return cimClass; }
+            get
+            {
+                return cimClass;
+            }
 
             set
             {
@@ -190,7 +202,10 @@ public CimClass CimClass
             ParameterSetName = CimBaseCommand.ResourceUriComputerSet)]
         public string Namespace
         {
-            get { return nameSpace; }
+            get
+            {
+                return nameSpace;
+            }
 
             set
             {
@@ -231,7 +246,10 @@ public string Namespace
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -263,7 +281,10 @@ public CimSession[] CimSession
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computerName; }
+            get
+            {
+                return computerName;
+            }
 
             set
             {
@@ -291,7 +312,10 @@ public string[] ComputerName
             ParameterSetName = CimBaseCommand.CimClassSessionSet)]
         public SwitchParameter ClientOnly
         {
-            get { return clientOnly; }
+            get
+            {
+                return clientOnly;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
index a4a93419e70..ed8499cf8ba 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
@@ -33,7 +33,10 @@ public sealed class NewCimSessionCommand : CimBaseCommand
             ParameterSetName = CredentialParameterSet)]
         public PasswordAuthenticationMechanism Authentication
         {
-            get { return authentication; }
+            get
+            {
+                return authentication;
+            }
 
             set
             {
@@ -103,7 +106,10 @@ public PasswordAuthenticationMechanism Authentication
         [Parameter(ValueFromPipelineByPropertyName = true)]
         public UInt32 OperationTimeoutSec
         {
-            get { return operationTimeout; }
+            get
+            {
+                return operationTimeout;
+            }
 
             set
             {
@@ -132,7 +138,10 @@ public UInt32 OperationTimeoutSec
         [Parameter(ValueFromPipelineByPropertyName = true)]
         public UInt32 Port
         {
-            get { return port; }
+            get
+            {
+                return port;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
index 7fb8f91b9dc..0b62b79d96c 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
@@ -64,7 +64,10 @@ public NewCimSessionOptionCommand()
         [Parameter(ParameterSetName = WSManParameterSet)]
         public SwitchParameter NoEncryption
         {
-            get { return noEncryption; }
+            get
+            {
+                return noEncryption;
+            }
 
             set
             {
@@ -85,7 +88,10 @@ public SwitchParameter NoEncryption
                    ParameterSetName = WSManParameterSet)]
         public SwitchParameter SkipCACheck
         {
-            get { return skipCACheck; }
+            get
+            {
+                return skipCACheck;
+            }
 
             set
             {
@@ -106,7 +112,10 @@ public SwitchParameter SkipCACheck
                    ParameterSetName = WSManParameterSet)]
         public SwitchParameter SkipCNCheck
         {
-            get { return skipCNCheck; }
+            get
+            {
+                return skipCNCheck;
+            }
 
             set
             {
@@ -127,7 +136,10 @@ public SwitchParameter SkipCNCheck
                    ParameterSetName = WSManParameterSet)]
         public SwitchParameter SkipRevocationCheck
         {
-            get { return skipRevocationCheck; }
+            get
+            {
+                return skipRevocationCheck;
+            }
 
             set
             {
@@ -148,7 +160,10 @@ public SwitchParameter SkipRevocationCheck
                    ParameterSetName = WSManParameterSet)]
         public SwitchParameter EncodePortInServicePrincipalName
         {
-            get { return encodeportinserviceprincipalname; }
+            get
+            {
+                return encodeportinserviceprincipalname;
+            }
 
             set
             {
@@ -171,7 +186,10 @@ public SwitchParameter EncodePortInServicePrincipalName
                    ParameterSetName = WSManParameterSet)]
         public PacketEncoding Encoding
         {
-            get { return encoding; }
+            get
+            {
+                return encoding;
+            }
 
             set
             {
@@ -193,7 +211,10 @@ public PacketEncoding Encoding
                    ParameterSetName = WSManParameterSet)]
         public Uri HttpPrefix
         {
-            get { return httpprefix; }
+            get
+            {
+                return httpprefix;
+            }
 
             set
             {
@@ -212,7 +233,10 @@ public Uri HttpPrefix
                    ParameterSetName = WSManParameterSet)]
         public UInt32 MaxEnvelopeSizeKB
         {
-            get { return maxenvelopesizekb; }
+            get
+            {
+                return maxenvelopesizekb;
+            }
 
             set
             {
@@ -233,7 +257,10 @@ public UInt32 MaxEnvelopeSizeKB
                    ParameterSetName = WSManParameterSet)]
         public PasswordAuthenticationMechanism ProxyAuthentication
         {
-            get { return proxyAuthentication; }
+            get
+            {
+                return proxyAuthentication;
+            }
 
             set
             {
@@ -253,7 +280,10 @@ public PasswordAuthenticationMechanism ProxyAuthentication
                    ParameterSetName = WSManParameterSet)]
         public string ProxyCertificateThumbprint
         {
-            get { return proxycertificatethumbprint; }
+            get
+            {
+                return proxycertificatethumbprint;
+            }
 
             set
             {
@@ -272,7 +302,10 @@ public string ProxyCertificateThumbprint
         [Credential()]
         public PSCredential ProxyCredential
         {
-            get { return proxycredential; }
+            get
+            {
+                return proxycredential;
+            }
 
             set
             {
@@ -292,7 +325,10 @@ public PSCredential ProxyCredential
                    ParameterSetName = WSManParameterSet)]
         public ProxyType ProxyType
         {
-            get { return proxytype; }
+            get
+            {
+                return proxytype;
+            }
 
             set
             {
@@ -313,7 +349,10 @@ public ProxyType ProxyType
                    ParameterSetName = WSManParameterSet)]
         public SwitchParameter UseSsl
         {
-            get { return usessl; }
+            get
+            {
+                return usessl;
+            }
 
             set
             {
@@ -334,7 +373,10 @@ public SwitchParameter UseSsl
         [Parameter(ParameterSetName = DcomParameterSet)]
         public ImpersonationType Impersonation
         {
-            get { return impersonation; }
+            get
+            {
+                return impersonation;
+            }
 
             set
             {
@@ -355,7 +397,10 @@ public ImpersonationType Impersonation
         [Parameter(ParameterSetName = DcomParameterSet)]
         public SwitchParameter PacketIntegrity
         {
-            get { return packetintegrity; }
+            get
+            {
+                return packetintegrity;
+            }
 
             set
             {
@@ -376,7 +421,10 @@ public SwitchParameter PacketIntegrity
         [Parameter(ParameterSetName = DcomParameterSet)]
         public SwitchParameter PacketPrivacy
         {
-            get { return packetprivacy; }
+            get
+            {
+                return packetprivacy;
+            }
 
             set
             {
@@ -400,7 +448,10 @@ public SwitchParameter PacketPrivacy
             ParameterSetName = ProtocolNameParameterSet)]
         public ProtocolType Protocol
         {
-            get { return protocol; }
+            get
+            {
+                return protocol;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
index 159a75ed3ef..246a95f37e3 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
@@ -50,7 +50,10 @@ public class RegisterCimIndicationCommand : ObjectEventRegistrationBase
             ParameterSetName = CimBaseCommand.ClassNameComputerSet)]
         public string ClassName
         {
-            get { return className; }
+            get
+            {
+                return className;
+            }
 
             set
             {
@@ -75,7 +78,10 @@ public string ClassName
             ParameterSetName = CimBaseCommand.QueryExpressionComputerSet)]
         public string Query
         {
-            get { return query; }
+            get
+            {
+                return query;
+            }
 
             set
             {
@@ -97,7 +103,10 @@ public string Query
         [Parameter(ParameterSetName = CimBaseCommand.QueryExpressionSessionSet)]
         public string QueryDialect
         {
-            get { return queryDialect; }
+            get
+            {
+                return queryDialect;
+            }
 
             set
             {
@@ -129,7 +138,10 @@ public string QueryDialect
             ParameterSetName = CimBaseCommand.ClassNameSessionSet)]
         public CimSession CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -150,7 +162,10 @@ public CimSession CimSession
         [Parameter(ParameterSetName = CimBaseCommand.ClassNameComputerSet)]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
index dcdcbd405f7..c6ab9a8c974 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
@@ -53,7 +53,10 @@ public RemoveCimInstanceCommand()
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -76,7 +79,10 @@ public CimSession[] CimSession
                    ParameterSetName = CimBaseCommand.CimInstanceSessionSet)]
         public Uri ResourceUri
         {
-            get { return resourceUri; }
+            get
+            {
+                return resourceUri;
+            }
 
             set
             {
@@ -99,7 +105,10 @@ public Uri ResourceUri
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -124,7 +133,10 @@ public string[] ComputerName
             ParameterSetName = CimBaseCommand.QueryComputerSet)]
         public string Namespace
         {
-            get { return nameSpace; }
+            get
+            {
+                return nameSpace;
+            }
 
             set
             {
@@ -161,7 +173,10 @@ public string Namespace
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return CimInstance; }
+            get
+            {
+                return CimInstance;
+            }
 
             set
             {
@@ -190,7 +205,10 @@ public CimInstance InputObject
             ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public string Query
         {
-            get { return query; }
+            get
+            {
+                return query;
+            }
 
             set
             {
@@ -212,7 +230,10 @@ public string Query
                    ParameterSetName = CimBaseCommand.QueryComputerSet)]
         public string QueryDialect
         {
-            get { return querydialect; }
+            get
+            {
+                return querydialect;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs
index 00f575c41c8..53937e57354 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs
@@ -54,7 +54,10 @@ public RemoveCimSessionCommand()
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimsession; }
+            get
+            {
+                return cimsession;
+            }
 
             set
             {
@@ -81,7 +84,10 @@ public CimSession[] CimSession
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -104,7 +110,10 @@ public string[] ComputerName
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public UInt32[] Id
         {
-            get { return id; }
+            get
+            {
+                return id;
+            }
 
             set
             {
@@ -127,7 +136,10 @@ public UInt32[] Id
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public Guid[] InstanceId
         {
-            get { return instanceid; }
+            get
+            {
+                return instanceid;
+            }
 
             set
             {
@@ -150,7 +162,10 @@ public Guid[] InstanceId
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] Name
         {
-            get { return name; }
+            get
+            {
+                return name;
+            }
 
             set
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
index 03c01785f1c..d9f95fd6e39 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
@@ -54,7 +54,10 @@ public SetCimInstanceCommand()
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public CimSession[] CimSession
         {
-            get { return cimSession; }
+            get
+            {
+                return cimSession;
+            }
 
             set
             {
@@ -77,7 +80,10 @@ public CimSession[] CimSession
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -100,7 +106,10 @@ public string[] ComputerName
                    ParameterSetName = CimBaseCommand.CimInstanceSessionSet)]
         public Uri ResourceUri
         {
-            get { return resourceUri; }
+            get
+            {
+                return resourceUri;
+            }
 
             set
             {
@@ -121,7 +130,10 @@ public Uri ResourceUri
             ParameterSetName = CimBaseCommand.QueryComputerSet)]
         public string Namespace
         {
-            get { return nameSpace; }
+            get
+            {
+                return nameSpace;
+            }
 
             set
             {
@@ -158,7 +170,10 @@ public string Namespace
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return CimInstance; }
+            get
+            {
+                return CimInstance;
+            }
 
             set
             {
@@ -187,7 +202,10 @@ public CimInstance InputObject
             ParameterSetName = CimBaseCommand.QuerySessionSet)]
         public string Query
         {
-            get { return query; }
+            get
+            {
+                return query;
+            }
 
             set
             {
@@ -209,7 +227,10 @@ public string Query
                    ParameterSetName = CimBaseCommand.QueryComputerSet)]
         public string QueryDialect
         {
-            get { return querydialect; }
+            get
+            {
+                return querydialect;
+            }
 
             set
             {
@@ -244,7 +265,10 @@ public string QueryDialect
         [Alias("Arguments")]
         public IDictionary Property
         {
-            get { return property; }
+            get
+            {
+                return property;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs
index b3f98a9364e..e0deef88b38 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs
@@ -63,7 +63,10 @@ public string[] ListSet
                             Justification = "A string[] is required here because that is the type Powershell supports")]
         public string[] Counter
         {
-            get { return _counter; }
+            get
+            {
+                return _counter;
+            }
 
             set
             {
@@ -115,7 +118,10 @@ public int SampleInterval
         [ValidateRange((Int64)1, Int64.MaxValue)]
         public Int64 MaxSamples
         {
-            get { return _maxSamples; }
+            get
+            {
+                return _maxSamples;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
index 79fc1dd0461..fb6b638b9df 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
@@ -75,7 +75,10 @@ protected virtual void Dispose(bool disposing)
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         protected TSession[] Session
         {
-            get { return _session ??= new TSession[] { this.DefaultSession }; }
+            get
+            {
+                return _session ??= new TSession[] { this.DefaultSession };
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 9d30f5b3a08..5f998aefe91 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -233,7 +233,10 @@ public class RestartComputerCommand : PSCmdlet, IDisposable
         [ValidateRange(-1, int.MaxValue)]
         public int Timeout
         {
-            get { return _timeout; }
+            get
+            {
+                return _timeout;
+            }
 
             set
             {
@@ -252,7 +255,10 @@ public int Timeout
         [Parameter(ParameterSetName = DefaultParameterSet)]
         public WaitForServiceTypes For
         {
-            get { return _waitFor; }
+            get
+            {
+                return _waitFor;
+            }
 
             set
             {
@@ -272,7 +278,10 @@ public WaitForServiceTypes For
         [ValidateRange(1, Int16.MaxValue)]
         public Int16 Delay
         {
-            get { return (Int16)_delay; }
+            get
+            {
+                return (Int16)_delay;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
index b591e05f7de..0c990292b58 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
@@ -34,7 +34,10 @@ public class ContentCommandBase : CoreCommandWithCredentialsBase, IDisposable
         [Alias("PSPath", "LP")]
         public string[] LiteralPath
         {
-            get { return Path; }
+            get
+            {
+                return Path;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/CopyPropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/CopyPropertyCommand.cs
index 10f7a28a8a7..ff13448bc09 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/CopyPropertyCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/CopyPropertyCommand.cs
@@ -34,7 +34,10 @@ public string[] Path
         [Alias("PSPath", "LP")]
         public string[] LiteralPath
         {
-            get { return paths; }
+            get
+            {
+                return paths;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs
index dc272f40281..dd878bd72ce 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetClipboardCommand.cs
@@ -23,7 +23,10 @@ public class GetClipboardCommand : PSCmdlet
         [Parameter]
         public SwitchParameter Raw
         {
-            get { return _raw; }
+            get
+            {
+                return _raw;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
index f01645544bb..f689695fc38 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
@@ -59,7 +59,10 @@ public long TotalCount
         [Alias("Last")]
         public int Tail
         {
-            get { return _backCount; }
+            get
+            {
+                return _backCount;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
index 94204269010..fb90ec1c502 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
@@ -35,7 +35,10 @@ public string[] Path
         [Alias("PSPath", "LP")]
         public string[] LiteralPath
         {
-            get { return paths; }
+            get
+            {
+                return paths;
+            }
 
             set
             {
@@ -51,7 +54,10 @@ public string[] LiteralPath
         [Alias("PSProperty")]
         public string[] Name
         {
-            get { return _property; }
+            get
+            {
+                return _property;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/PingPathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/PingPathCommand.cs
index 197ffa694bd..9bebcd076ca 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/PingPathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/PingPathCommand.cs
@@ -62,7 +62,10 @@ public string[] Path
         [AllowEmptyString]
         public string[] LiteralPath
         {
-            get { return _paths; }
+            get
+            {
+                return _paths;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
index c6eb4327471..3451fd96ac2 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -476,7 +476,10 @@ public sealed class GetProcessCommand : ProcessBaseCommand
         [ValidateNotNullOrEmpty]
         public string[] Name
         {
-            get { return processNames; }
+            get
+            {
+                return processNames;
+            }
 
             set
             {
@@ -878,7 +881,10 @@ public int[] Id
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] Name
         {
-            get { return processNames; }
+            get
+            {
+                return processNames;
+            }
 
             set
             {
@@ -1472,7 +1478,10 @@ public int[] Id
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] Name
         {
-            get { return processNames; }
+            get
+            {
+                return processNames;
+            }
 
             set
             {
@@ -1635,7 +1644,10 @@ public sealed class StartProcessCommand : PSCmdlet, IDisposable
         [Credential]
         public PSCredential Credential
         {
-            get { return _credential; }
+            get
+            {
+                return _credential;
+            }
 
             set
             {
@@ -1660,7 +1672,10 @@ public PSCredential Credential
         [Alias("Lup")]
         public SwitchParameter LoadUserProfile
         {
-            get { return _loaduserprofile; }
+            get
+            {
+                return _loaduserprofile;
+            }
 
             set
             {
@@ -1678,7 +1693,10 @@ public SwitchParameter LoadUserProfile
         [Alias("nnw")]
         public SwitchParameter NoNewWindow
         {
-            get { return _nonewwindow; }
+            get
+            {
+                return _nonewwindow;
+            }
 
             set
             {
@@ -1703,7 +1721,10 @@ public SwitchParameter NoNewWindow
         [ValidateNotNullOrEmpty]
         public string RedirectStandardError
         {
-            get { return _redirectstandarderror; }
+            get
+            {
+                return _redirectstandarderror;
+            }
 
             set
             {
@@ -1722,7 +1743,10 @@ public string RedirectStandardError
         [ValidateNotNullOrEmpty]
         public string RedirectStandardInput
         {
-            get { return _redirectstandardinput; }
+            get
+            {
+                return _redirectstandardinput;
+            }
 
             set
             {
@@ -1741,7 +1765,10 @@ public string RedirectStandardInput
         [ValidateNotNullOrEmpty]
         public string RedirectStandardOutput
         {
-            get { return _redirectstandardoutput; }
+            get
+            {
+                return _redirectstandardoutput;
+            }
 
             set
             {
@@ -1769,7 +1796,10 @@ public string RedirectStandardOutput
         [ValidateNotNullOrEmpty]
         public ProcessWindowStyle WindowStyle
         {
-            get { return _windowstyle; }
+            get
+            {
+                return _windowstyle;
+            }
 
             set
             {
@@ -1793,7 +1823,10 @@ public ProcessWindowStyle WindowStyle
         [Parameter(ParameterSetName = "Default")]
         public SwitchParameter UseNewEnvironment
         {
-            get { return _UseNewEnvironment; }
+            get
+            {
+                return _UseNewEnvironment;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
index a4471699922..1d793857c1a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -1495,7 +1495,10 @@ public class SetServiceCommand : ServiceOperationBaseCommand
         [Alias("ServiceName", "SN")]
         public new string Name
         {
-            get { return serviceName; }
+            get
+            {
+                return serviceName;
+            }
 
             set
             {
@@ -1523,7 +1526,10 @@ public class SetServiceCommand : ServiceOperationBaseCommand
         [Alias("DN")]
         public new string DisplayName
         {
-            get { return displayName; }
+            get
+            {
+                return displayName;
+            }
 
             set
             {
@@ -1552,7 +1558,10 @@ public class SetServiceCommand : ServiceOperationBaseCommand
         [ValidateNotNullOrEmpty]
         public string Description
         {
-            get { return description; }
+            get
+            {
+                return description;
+            }
 
             set
             {
@@ -1575,7 +1584,10 @@ public string Description
         [ValidateNotNullOrEmpty]
         public ServiceStartupType StartupType
         {
-            get { return startupType; }
+            get
+            {
+                return startupType;
+            }
 
             set
             {
@@ -1611,7 +1623,10 @@ public string SecurityDescriptorSddl
         [ValidateSetAttribute(new string[] { "Running", "Stopped", "Paused" })]
         public string Status
         {
-            get { return serviceStatus; }
+            get
+            {
+                return serviceStatus;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/SetPropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/SetPropertyCommand.cs
index e2c01168256..7c5f43aad2b 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/SetPropertyCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/SetPropertyCommand.cs
@@ -43,7 +43,10 @@ public string[] Path
         [Alias("PSPath", "LP")]
         public string[] LiteralPath
         {
-            get { return paths; }
+            get
+            {
+                return paths;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index a54094ea464..b86cadc1eff 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -292,7 +292,10 @@ private void ProcessPaths(List<string> resolvedPaths)
         [Alias("RA")]
         public string[] ReferencedAssemblies
         {
-            get { return _referencedAssemblies; }
+            get
+            {
+                return _referencedAssemblies;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
index 714054275d0..83f78ce77a2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
@@ -72,7 +72,10 @@ public SwitchParameter ExcludeDifferent
         [Parameter]
         public SwitchParameter IncludeEqual
         {
-            get { return _includeEqual; }
+            get
+            {
+                return _includeEqual;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
index 013f9079d63..22c1e5ef46b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
@@ -31,7 +31,10 @@ public sealed class ConvertFromSddlStringCommand : PSCmdlet
         [Parameter]
         public AccessRightTypeNames Type
         {
-            get { return _type; }
+            get
+            {
+                return _type;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
index 7260bc51d95..e01d8c28e0c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
@@ -55,7 +55,10 @@ public string Path
         [Alias("PSPath", "LP")]
         public string LiteralPath
         {
-            get { return _path; }
+            get
+            {
+                return _path;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
index 7a8613ac032..8d80462c12f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
@@ -54,7 +54,10 @@ public SwitchParameter AutoSize
                 return false;
             }
 
-            set { _autosize = value; }
+            set
+            {
+                _autosize = value;
+            }
         }
 
         private bool? _autosize = null;
@@ -74,7 +77,10 @@ public int Column
                 return -1;
             }
 
-            set { _column = value; }
+            set
+            {
+                _column = value;
+            }
         }
 
         private int? _column = null;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
index 7a6bcc6bc1b..40f06e58eca 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
@@ -57,7 +57,10 @@ public class ObjectCmdletBase : PSCmdlet
         [System.Diagnostics.CodeAnalysis.SuppressMessage("GoldMan", "#pw17903:UseOfLCID", Justification = "The CultureNumber is only used if the property has been set with a hex string starting with 0x")]
         public string Culture
         {
-            get { return _cultureInfo?.ToString(); }
+            get
+            {
+                return _cultureInfo?.ToString();
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
index 7ada7d4b947..d137524629d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
@@ -50,7 +50,10 @@ private static bool HasBeenSpecified(object obj)
                      System.Management.Automation.Runspaces.TypeData.CodeMethod, IgnoreCase = true)]
         public PSMemberTypes MemberType
         {
-            get { return _memberType; }
+            get
+            {
+                return _memberType;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
index cfd216edc41..8db56196a68 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
@@ -836,7 +836,10 @@ public class SelectXmlCommand : PSCmdlet
         [Alias("PSPath", "LP")]
         public string[] LiteralPath
         {
-            get { return Path; }
+            get
+            {
+                return Path;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/SetTracerCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/SetTracerCommand.cs
index d05a535145d..a17ee0fdbef 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/SetTracerCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/SetTracerCommand.cs
@@ -34,7 +34,10 @@ public string[] Name
         [Parameter(Position = 1, ValueFromPipelineByPropertyName = true, ParameterSetName = "optionsSet")]
         public PSTraceSourceOptions Option
         {
-            get { return base.OptionsInternal; }
+            get
+            {
+                return base.OptionsInternal;
+            }
 
             set
             {
@@ -48,7 +51,10 @@ public PSTraceSourceOptions Option
         [Parameter(ParameterSetName = "optionsSet")]
         public TraceOptions ListenerOption
         {
-            get { return base.ListenerOptionsInternal; }
+            get
+            {
+                return base.ListenerOptionsInternal;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
index 8179b9179d1..412f4a2d150 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -46,7 +46,10 @@ public string[] Name
         [Parameter(Position = 2)]
         public PSTraceSourceOptions Option
         {
-            get { return base.OptionsInternal; }
+            get
+            {
+                return base.OptionsInternal;
+            }
 
             set
             {
@@ -82,7 +85,10 @@ public PSTraceSourceOptions Option
         [Parameter]
         public TraceOptions ListenerOption
         {
-            get { return base.ListenerOptionsInternal; }
+            get
+            {
+                return base.ListenerOptionsInternal;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
index abdb6ae17bc..f1e4fe2dfa0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
@@ -32,7 +32,10 @@ public class TraceListenerCommandBase : TraceCommandBase
         /// <value></value>
         internal PSTraceSourceOptions OptionsInternal
         {
-            get { return _options; }
+            get
+            {
+                return _options;
+            }
 
             set
             {
@@ -53,7 +56,10 @@ internal PSTraceSourceOptions OptionsInternal
         /// </summary>
         internal TraceOptions ListenerOptionsInternal
         {
-            get { return _traceOptions; }
+            get
+            {
+                return _traceOptions;
+            }
 
             set
             {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
index a189481ce98..2a6ea89176d 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
@@ -1369,7 +1369,10 @@ public override Size BufferSize
                     : new Size(Console.BufferWidth, Console.BufferHeight);
             }
 
-            set { Console.SetBufferSize(value.Width, value.Height); }
+            set
+            {
+                Console.SetBufferSize(value.Width, value.Height);
+            }
         }
 
         /// <summary>
@@ -1377,7 +1380,10 @@ public override Size BufferSize
         /// </summary>
         public override Coordinates CursorPosition
         {
-            get { return new Coordinates(Console.CursorLeft, Console.CursorTop); }
+            get
+            {
+                return new Coordinates(Console.CursorLeft, Console.CursorTop);
+            }
 
             set
             {
@@ -1475,7 +1481,10 @@ public override Size WindowSize
                     : new Size(Console.WindowWidth, Console.WindowHeight);
             }
 
-            set { Console.SetWindowSize(value.Width, value.Height); }
+            set
+            {
+                Console.SetWindowSize(value.Width, value.Height);
+            }
         }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
index 49a37d06c78..a17c6274aba 100644
--- a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
@@ -104,7 +104,10 @@ public string[] SourcePathOrExtension
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public byte[] Content
         {
-            get { return _content; }
+            get
+            {
+                return _content;
+            }
 
             set
             {
diff --git a/src/Microsoft.WSMan.Management/InvokeWSManAction.cs b/src/Microsoft.WSMan.Management/InvokeWSManAction.cs
index 9420dd4a77f..36f65e52705 100644
--- a/src/Microsoft.WSMan.Management/InvokeWSManAction.cs
+++ b/src/Microsoft.WSMan.Management/InvokeWSManAction.cs
@@ -68,7 +68,10 @@ public string ApplicationName
         [Alias("cn")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
diff --git a/src/Microsoft.WSMan.Management/NewWSManSession.cs b/src/Microsoft.WSMan.Management/NewWSManSession.cs
index 2bb367aeecc..30959f3ced5 100644
--- a/src/Microsoft.WSMan.Management/NewWSManSession.cs
+++ b/src/Microsoft.WSMan.Management/NewWSManSession.cs
@@ -60,7 +60,10 @@ public ProxyAccessType ProxyAccessType
         [ValidateNotNullOrEmpty]
         public ProxyAuthentication ProxyAuthentication
         {
-            get { return proxyauthentication; }
+            get
+            {
+                return proxyauthentication;
+            }
 
             set
             {
@@ -78,7 +81,10 @@ public ProxyAuthentication ProxyAuthentication
         [Credential]
         public PSCredential ProxyCredential
         {
-            get { return _proxycredential; }
+            get
+            {
+                return _proxycredential;
+            }
 
             set
             {
@@ -99,7 +105,10 @@ public PSCredential ProxyCredential
         [Parameter]
         public SwitchParameter SkipCACheck
         {
-            get { return skipcacheck; }
+            get
+            {
+                return skipcacheck;
+            }
 
             set
             {
@@ -118,7 +127,10 @@ public SwitchParameter SkipCACheck
         [Parameter]
         public SwitchParameter SkipCNCheck
         {
-            get { return skipcncheck; }
+            get
+            {
+                return skipcncheck;
+            }
 
             set
             {
@@ -137,7 +149,10 @@ public SwitchParameter SkipCNCheck
         [Parameter]
         public SwitchParameter SkipRevocationCheck
         {
-            get { return skiprevocationcheck; }
+            get
+            {
+                return skiprevocationcheck;
+            }
 
             set
             {
@@ -158,7 +173,10 @@ public SwitchParameter SkipRevocationCheck
         [ValidateRange(0, Int32.MaxValue)]
         public Int32 SPNPort
         {
-            get { return spnport; }
+            get
+            {
+                return spnport;
+            }
 
             set
             {
@@ -177,7 +195,10 @@ public Int32 SPNPort
         [ValidateRange(0, Int32.MaxValue)]
         public Int32 OperationTimeout
         {
-            get { return operationtimeout; }
+            get
+            {
+                return operationtimeout;
+            }
 
             set
             {
@@ -196,7 +217,10 @@ public Int32 OperationTimeout
         [Parameter]
         public SwitchParameter NoEncryption
         {
-            get { return noencryption; }
+            get
+            {
+                return noencryption;
+            }
 
             set
             {
@@ -215,7 +239,10 @@ public SwitchParameter NoEncryption
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "UTF")]
         public SwitchParameter UseUTF16
         {
-            get { return useutf16; }
+            get
+            {
+                return useutf16;
+            }
 
             set
             {
diff --git a/src/Microsoft.WSMan.Management/PingWSMan.cs b/src/Microsoft.WSMan.Management/PingWSMan.cs
index 47ca6ef738b..a04167a0f1b 100644
--- a/src/Microsoft.WSMan.Management/PingWSMan.cs
+++ b/src/Microsoft.WSMan.Management/PingWSMan.cs
@@ -35,7 +35,10 @@ public class TestWSManCommand : AuthenticatingWSManCommand, IDisposable
         [Alias("cn")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -72,7 +75,10 @@ public string ComputerName
         [Alias("auth", "am")]
         public override AuthenticationMechanism Authentication
         {
-            get { return authentication; }
+            get
+            {
+                return authentication;
+            }
 
             set
             {
diff --git a/src/Microsoft.WSMan.Management/WSManConnections.cs b/src/Microsoft.WSMan.Management/WSManConnections.cs
index 6d6c5f6bc0e..85c5d1ba0ae 100644
--- a/src/Microsoft.WSMan.Management/WSManConnections.cs
+++ b/src/Microsoft.WSMan.Management/WSManConnections.cs
@@ -38,7 +38,10 @@ public class AuthenticatingWSManCommand : PSCmdlet
         [Alias("cred", "c")]
         public virtual PSCredential Credential
         {
-            get { return credential; }
+            get
+            {
+                return credential;
+            }
 
             set
             {
@@ -69,7 +72,10 @@ public virtual PSCredential Credential
         [Alias("auth", "am")]
         public virtual AuthenticationMechanism Authentication
         {
-            get { return authentication; }
+            get
+            {
+                return authentication;
+            }
 
             set
             {
@@ -88,7 +94,10 @@ public virtual AuthenticationMechanism Authentication
         [ValidateNotNullOrEmpty]
         public virtual string CertificateThumbprint
         {
-            get { return thumbPrint; }
+            get
+            {
+                return thumbPrint;
+            }
 
             set
             {
@@ -144,7 +153,10 @@ public string ApplicationName
         [Alias("cn")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -300,7 +312,10 @@ public class DisconnectWSManCommand : PSCmdlet, IDisposable
         [Parameter(Position = 0)]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
diff --git a/src/Microsoft.WSMan.Management/WSManInstance.cs b/src/Microsoft.WSMan.Management/WSManInstance.cs
index b4fb9ed955c..733316c785f 100644
--- a/src/Microsoft.WSMan.Management/WSManInstance.cs
+++ b/src/Microsoft.WSMan.Management/WSManInstance.cs
@@ -40,7 +40,10 @@ public class GetWSManInstanceCommand : AuthenticatingWSManCommand, IDisposable
         [Parameter(ParameterSetName = "Enumerate")]
         public string ApplicationName
         {
-            get { return applicationname; }
+            get
+            {
+                return applicationname;
+            }
 
             set
             {
@@ -60,7 +63,10 @@ public string ApplicationName
         [Alias("UBPO", "Base")]
         public SwitchParameter BasePropertiesOnly
         {
-            get { return basepropertiesonly; }
+            get
+            {
+                return basepropertiesonly;
+            }
 
             set
             {
@@ -81,7 +87,10 @@ public SwitchParameter BasePropertiesOnly
         [Alias("CN")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -109,7 +118,10 @@ public string ComputerName
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "URI")]
         public Uri ConnectionURI
         {
-            get { return connectionuri; }
+            get
+            {
+                return connectionuri;
+            }
 
             set
             {
@@ -126,7 +138,10 @@ public Uri ConnectionURI
         [Parameter]
         public Uri Dialect
         {
-            get { return dialect; }
+            get
+            {
+                return dialect;
+            }
 
             set
             {
@@ -145,7 +160,10 @@ public Uri Dialect
                   ParameterSetName = "Enumerate")]
         public SwitchParameter Enumerate
         {
-            get { return enumerate; }
+            get
+            {
+                return enumerate;
+            }
 
             set
             {
@@ -163,7 +181,10 @@ public SwitchParameter Enumerate
         [ValidateNotNullOrEmpty]
         public string Filter
         {
-            get { return filter; }
+            get
+            {
+                return filter;
+            }
 
             set
             {
@@ -182,7 +203,10 @@ public string Filter
         [ValidateNotNullOrEmpty]
         public string Fragment
         {
-            get { return fragment; }
+            get
+            {
+                return fragment;
+            }
 
             set
             {
@@ -204,7 +228,10 @@ public string Fragment
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public Hashtable OptionSet
         {
-            get { return optionset; }
+            get
+            {
+                return optionset;
+            }
 
             set
             {
@@ -222,7 +249,10 @@ public Hashtable OptionSet
         [Parameter(ParameterSetName = "GetInstance")]
         public Int32 Port
         {
-            get { return port; }
+            get
+            {
+                return port;
+            }
 
             set
             {
@@ -241,7 +271,10 @@ public Int32 Port
         [Parameter(ParameterSetName = "Enumerate")]
         public SwitchParameter Associations
         {
-            get { return associations; }
+            get
+            {
+                return associations;
+            }
 
             set
             {
@@ -264,7 +297,10 @@ public SwitchParameter Associations
         [Alias("RURI")]
         public Uri ResourceURI
         {
-            get { return resourceuri; }
+            get
+            {
+                return resourceuri;
+            }
 
             set
             {
@@ -293,7 +329,10 @@ public Uri ResourceURI
         [Alias("RT")]
         public string ReturnType
         {
-            get { return returntype; }
+            get
+            {
+                return returntype;
+            }
 
             set
             {
@@ -315,7 +354,10 @@ public string ReturnType
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public Hashtable SelectorSet
         {
-            get { return selectorset; }
+            get
+            {
+                return selectorset;
+            }
 
             set
             {
@@ -336,7 +378,10 @@ public Hashtable SelectorSet
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public SessionOption SessionOption
         {
-            get { return sessionoption; }
+            get
+            {
+                return sessionoption;
+            }
 
             set
             {
@@ -356,7 +401,10 @@ public SessionOption SessionOption
 
         public SwitchParameter Shallow
         {
-            get { return shallow; }
+            get
+            {
+                return shallow;
+            }
 
             set
             {
@@ -379,7 +427,10 @@ public SwitchParameter Shallow
         [Alias("SSL")]
         public SwitchParameter UseSSL
         {
-            get { return usessl; }
+            get
+            {
+                return usessl;
+            }
 
             set
             {
@@ -662,7 +713,10 @@ public string ApplicationName
         [Alias("cn")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -1032,7 +1086,10 @@ public string ApplicationName
         [Alias("cn")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
@@ -1294,7 +1351,10 @@ public string ApplicationName
         [Alias("cn")]
         public string ComputerName
         {
-            get { return computername; }
+            get
+            {
+                return computername;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
index 48a791177ba..18b74cbcfe1 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs
@@ -576,7 +576,10 @@ public SwitchParameter ShowError
                 return false;
             }
 
-            set { showErrorsAsMessages = value; }
+            set
+            {
+                showErrorsAsMessages = value;
+            }
         }
 
         internal bool? showErrorsAsMessages = null;
@@ -595,7 +598,10 @@ public SwitchParameter DisplayError
                 return false;
             }
 
-            set { showErrorsInFormattedOutput = value; }
+            set
+            {
+                showErrorsInFormattedOutput = value;
+            }
         }
 
         internal bool? showErrorsInFormattedOutput = null;
@@ -792,7 +798,10 @@ public SwitchParameter AutoSize
                 return false;
             }
 
-            set { _autosize = value; }
+            set
+            {
+                _autosize = value;
+            }
         }
 
         private bool? _autosize = null;
@@ -817,7 +826,10 @@ public SwitchParameter HideTableHeaders
                 return false;
             }
 
-            set { _hideHeaders = value; }
+            set
+            {
+                _hideHeaders = value;
+            }
         }
 
         private bool? _hideHeaders = null;
@@ -836,7 +848,10 @@ public SwitchParameter Wrap
                 return false;
             }
 
-            set { _multiLine = value; }
+            set
+            {
+                _multiLine = value;
+            }
         }
 
         private bool? _multiLine = null;
diff --git a/src/System.Management.Automation/engine/ApplicationInfo.cs b/src/System.Management.Automation/engine/ApplicationInfo.cs
index ffaae6fb800..5fe76424f5a 100644
--- a/src/System.Management.Automation/engine/ApplicationInfo.cs
+++ b/src/System.Management.Automation/engine/ApplicationInfo.cs
@@ -113,7 +113,10 @@ public override SessionStateEntryVisibility Visibility
                 return _context.EngineSessionState.CheckApplicationVisibility(Path);
             }
 
-            set { throw PSTraceSource.NewNotImplementedException(); }
+            set
+            {
+                throw PSTraceSource.NewNotImplementedException();
+            }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/Attributes.cs b/src/System.Management.Automation/engine/Attributes.cs
index 19a7aa881e7..8ab2530b030 100644
--- a/src/System.Management.Automation/engine/Attributes.cs
+++ b/src/System.Management.Automation/engine/Attributes.cs
@@ -326,7 +326,10 @@ public abstract class CmdletCommonMetadataAttribute : CmdletMetadataAttribute
         /// </summary>
         public bool SupportsTransactions
         {
-            get { return _supportsTransactions; }
+            get
+            {
+                return _supportsTransactions;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/CommandBase.cs b/src/System.Management.Automation/engine/CommandBase.cs
index 3f477895bb5..da2e97e516b 100644
--- a/src/System.Management.Automation/engine/CommandBase.cs
+++ b/src/System.Management.Automation/engine/CommandBase.cs
@@ -89,7 +89,10 @@ internal InvocationInfo MyInvocation
         /// </summary>
         internal PSObject CurrentPipelineObject
         {
-            get { return currentObjectInPipeline; }
+            get
+            {
+                return currentObjectInPipeline;
+            }
 
             set
             {
@@ -155,7 +158,10 @@ internal CommandInfo CommandInfo
         /// </exception>
         internal ExecutionContext Context
         {
-            get { return _context; }
+            get
+            {
+                return _context;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
index 4d89d87e51c..f31065080c6 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
@@ -1301,7 +1301,10 @@ private void Consume(char c)
 
             private int ReplacementIndex
             {
-                get { return _replacementIndex; }
+                get
+                {
+                    return _replacementIndex;
+                }
 
                 set
                 {
diff --git a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
index c86fc34cfaf..0d195280239 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
@@ -728,7 +728,10 @@ internal ParameterBindingResult()
         /// </summary>
         public object ConstantValue
         {
-            get { return _constantValue; }
+            get
+            {
+                return _constantValue;
+            }
 
             internal set
             {
@@ -745,7 +748,10 @@ internal set
         /// </summary>
         public CommandElementAst Value
         {
-            get { return _value; }
+            get
+            {
+                return _value;
+            }
 
             internal set
             {
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
index 2b328767f4c..5ccd485b118 100644
--- a/src/System.Management.Automation/engine/CommandDiscovery.cs
+++ b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -65,7 +65,10 @@ internal CommandLookupEventArgs(string commandName, CommandOrigin commandOrigin,
         /// </summary>
         public ScriptBlock CommandScriptBlock
         {
-            get { return _scriptBlock; }
+            get
+            {
+                return _scriptBlock;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/CommandInfo.cs b/src/System.Management.Automation/engine/CommandInfo.cs
index e1e7cf7697e..7538d9fb19f 100644
--- a/src/System.Management.Automation/engine/CommandInfo.cs
+++ b/src/System.Management.Automation/engine/CommandInfo.cs
@@ -230,7 +230,10 @@ public virtual Version Version
         /// </summary>
         internal ExecutionContext Context
         {
-            get { return _context; }
+            get
+            {
+                return _context;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/CommandMetadata.cs b/src/System.Management.Automation/engine/CommandMetadata.cs
index 027373ec676..eb59f9140a2 100644
--- a/src/System.Management.Automation/engine/CommandMetadata.cs
+++ b/src/System.Management.Automation/engine/CommandMetadata.cs
@@ -464,7 +464,10 @@ internal CommandMetadata(ScriptBlock scriptblock, string commandName, ExecutionC
         /// </summary>
         public string DefaultParameterSetName
         {
-            get { return _defaultParameterSetName; }
+            get
+            {
+                return _defaultParameterSetName;
+            }
 
             set
             {
@@ -528,7 +531,10 @@ public RemotingCapability RemotingCapability
                 return _remotingCapability;
             }
 
-            set { _remotingCapability = value; }
+            set
+            {
+                _remotingCapability = value;
+            }
         }
 
         private RemotingCapability _remotingCapability = RemotingCapability.PowerShell;
diff --git a/src/System.Management.Automation/engine/CommandProcessorBase.cs b/src/System.Management.Automation/engine/CommandProcessorBase.cs
index 6ab07114652..c6825cc6925 100644
--- a/src/System.Management.Automation/engine/CommandProcessorBase.cs
+++ b/src/System.Management.Automation/engine/CommandProcessorBase.cs
@@ -121,7 +121,10 @@ internal bool AddedToPipelineAlready
         /// </summary>
         internal InternalCommand Command
         {
-            get { return _command; }
+            get
+            {
+                return _command;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 6d7a6c8326a..61f65842c85 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -769,7 +769,10 @@ public string Message
         /// </remarks>
         public string RecommendedAction
         {
-            get { return ErrorRecord.NotNull(_recommendedAction); }
+            get
+            {
+                return ErrorRecord.NotNull(_recommendedAction);
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index 9c484a7c56f..3857de9ba38 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -83,7 +83,10 @@ internal int PSDebugTraceLevel
                 return IgnoreScriptDebug ? 0 : _debugTraceLevel;
             }
 
-            set { _debugTraceLevel = value; }
+            set
+            {
+                _debugTraceLevel = value;
+            }
         }
 
         private int _debugTraceLevel;
@@ -100,7 +103,10 @@ internal bool PSDebugTraceStep
                 return !IgnoreScriptDebug && _debugTraceStep;
             }
 
-            set { _debugTraceStep = value; }
+            set
+            {
+                _debugTraceStep = value;
+            }
         }
 
         private bool _debugTraceStep;
diff --git a/src/System.Management.Automation/engine/ExternalScriptInfo.cs b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
index b97da3b9970..bbd49c76d36 100644
--- a/src/System.Management.Automation/engine/ExternalScriptInfo.cs
+++ b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
@@ -193,7 +193,10 @@ public override SessionStateEntryVisibility Visibility
                 return Context.EngineSessionState.CheckScriptVisibility(_path);
             }
 
-            set { throw PSTraceSource.NewNotImplementedException(); }
+            set
+            {
+                throw PSTraceSource.NewNotImplementedException();
+            }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/GetCommandCommand.cs b/src/System.Management.Automation/engine/GetCommandCommand.cs
index 17efeb4ac73..91bfdccf789 100644
--- a/src/System.Management.Automation/engine/GetCommandCommand.cs
+++ b/src/System.Management.Automation/engine/GetCommandCommand.cs
@@ -280,7 +280,10 @@ public SwitchParameter ListImported
         [ValidateNotNullOrEmpty]
         public string[] ParameterName
         {
-            get { return _parameterNames; }
+            get
+            {
+                return _parameterNames;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/InformationRecord.cs b/src/System.Management.Automation/engine/InformationRecord.cs
index ad4aeeff5a9..310c34a8809 100644
--- a/src/System.Management.Automation/engine/InformationRecord.cs
+++ b/src/System.Management.Automation/engine/InformationRecord.cs
@@ -109,7 +109,10 @@ public string User
                 return _user;
             }
 
-            set { _user = value; }
+            set
+            {
+                _user = value;
+            }
         }
 
         private string _user;
@@ -143,7 +146,10 @@ public uint ProcessId
                 return this._processId.Value;
             }
 
-            set { _processId = value; }
+            set
+            {
+                _processId = value;
+            }
         }
 
         private uint? _processId;
diff --git a/src/System.Management.Automation/engine/InvocationInfo.cs b/src/System.Management.Automation/engine/InvocationInfo.cs
index 1ae22542c63..6020b6e53a0 100644
--- a/src/System.Management.Automation/engine/InvocationInfo.cs
+++ b/src/System.Management.Automation/engine/InvocationInfo.cs
@@ -204,7 +204,10 @@ public Dictionary<string, object> BoundParameters
                 return _boundParameters ??= new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
             }
 
-            internal set { _boundParameters = value; }
+            internal set
+            {
+                _boundParameters = value;
+            }
         }
 
         /// <summary>
@@ -381,7 +384,10 @@ internal IScriptExtent ScriptPosition
                 }
             }
 
-            set { _scriptPosition = value; }
+            set
+            {
+                _scriptPosition = value;
+            }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/Modules/ExportModuleMemberCommand.cs b/src/System.Management.Automation/engine/Modules/ExportModuleMemberCommand.cs
index 20eaf0baabe..8520e39258b 100644
--- a/src/System.Management.Automation/engine/Modules/ExportModuleMemberCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ExportModuleMemberCommand.cs
@@ -28,7 +28,10 @@ public sealed class ExportModuleMemberCommand : PSCmdlet
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Function
         {
-            get { return _functionList; }
+            get
+            {
+                return _functionList;
+            }
 
             set
             {
@@ -57,7 +60,10 @@ public string[] Function
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Cmdlet
         {
-            get { return _cmdletList; }
+            get
+            {
+                return _cmdletList;
+            }
 
             set
             {
@@ -86,7 +92,10 @@ public string[] Cmdlet
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Variable
         {
-            get { return _variableExportList; }
+            get
+            {
+                return _variableExportList;
+            }
 
             set
             {
@@ -115,7 +124,10 @@ public string[] Variable
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Alias
         {
-            get { return _aliasExportList; }
+            get
+            {
+                return _aliasExportList;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 35e0b61ab20..365d6e7642c 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -117,7 +117,10 @@ public string Prefix
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Function
         {
-            get { return _functionImportList; }
+            get
+            {
+                return _functionImportList;
+            }
 
             set
             {
@@ -144,7 +147,10 @@ public string[] Function
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Cmdlet
         {
-            get { return _cmdletImportList; }
+            get
+            {
+                return _cmdletImportList;
+            }
 
             set
             {
@@ -172,7 +178,10 @@ public string[] Cmdlet
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Variable
         {
-            get { return _variableExportList; }
+            get
+            {
+                return _variableExportList;
+            }
 
             set
             {
@@ -199,7 +208,10 @@ public string[] Variable
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Alias
         {
-            get { return _aliasExportList; }
+            get
+            {
+                return _aliasExportList;
+            }
 
             set
             {
@@ -375,7 +387,10 @@ public SwitchParameter DisableNameChecking
         [ValidateSet("Local", "Global")]
         public string Scope
         {
-            get { return _scope; }
+            get
+            {
+                return _scope;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/Modules/NewModuleCommand.cs b/src/System.Management.Automation/engine/Modules/NewModuleCommand.cs
index b661df41de1..d47681166a0 100644
--- a/src/System.Management.Automation/engine/Modules/NewModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/NewModuleCommand.cs
@@ -42,7 +42,10 @@ public string Name
         [ValidateNotNull]
         public ScriptBlock ScriptBlock
         {
-            get { return _scriptBlock; }
+            get
+            {
+                return _scriptBlock;
+            }
 
             set
             {
@@ -60,7 +63,10 @@ public ScriptBlock ScriptBlock
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Function
         {
-            get { return _functionImportList; }
+            get
+            {
+                return _functionImportList;
+            }
 
             set
             {
@@ -88,7 +94,10 @@ public string[] Function
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] Cmdlet
         {
-            get { return _cmdletImportList; }
+            get
+            {
+                return _cmdletImportList;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs b/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
index f2ab485aef0..f8625697800 100644
--- a/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
+++ b/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
@@ -470,7 +470,10 @@ public string Author
         /// </summary>
         public ModuleAccessMode AccessMode
         {
-            get { return _accessMode; }
+            get
+            {
+                return _accessMode;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index a1cd276fa89..e43e49631aa 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -3136,7 +3136,10 @@ internal ActionPreference WarningPreference
         /// </remarks>
         internal bool Verbose
         {
-            get { return _verboseFlag; }
+            get
+            {
+                return _verboseFlag;
+            }
 
             set
             {
@@ -3209,7 +3212,10 @@ internal SwitchParameter UseTransaction
         /// </remarks>
         internal bool Debug
         {
-            get { return _debugFlag; }
+            get
+            {
+                return _debugFlag;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
index c930a43ef99..8ee000a4faf 100644
--- a/src/System.Management.Automation/engine/Pipe.cs
+++ b/src/System.Management.Automation/engine/Pipe.cs
@@ -40,7 +40,10 @@ internal class Pipe
         /// </summary>
         internal CommandProcessorBase DownstreamCmdlet
         {
-            get { return _downstreamCmdlet; }
+            get
+            {
+                return _downstreamCmdlet;
+            }
 
             set
             {
@@ -76,7 +79,10 @@ internal CommandProcessorBase DownstreamCmdlet
         /// </summary>
         internal PipelineWriter ExternalWriter
         {
-            get { return _externalWriter; }
+            get
+            {
+                return _externalWriter;
+            }
 
             set
             {
@@ -108,7 +114,10 @@ public override string ToString()
         /// </summary>
         internal bool NullPipe
         {
-            get { return _nullPipe; }
+            get
+            {
+                return _nullPipe;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs b/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs
index adf4c396473..f444f46d2c3 100644
--- a/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs
@@ -116,7 +116,10 @@ internal IDictionary<string, FunctionInfo> GetFunctionTableAtScope(string scopeI
         /// </summary>
         internal bool FunctionsExportedWithWildcard
         {
-            get { return _functionsExportedWithWildcard; }
+            get
+            {
+                return _functionsExportedWithWildcard;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/SessionStateScope.cs b/src/System.Management.Automation/engine/SessionStateScope.cs
index 6f0c4fbbec3..fc5dff00784 100644
--- a/src/System.Management.Automation/engine/SessionStateScope.cs
+++ b/src/System.Management.Automation/engine/SessionStateScope.cs
@@ -64,7 +64,10 @@ internal SessionStateScope(SessionStateScope parentScope)
         /// </exception>
         internal SessionStateScope ScriptScope
         {
-            get { return _scriptScope; }
+            get
+            {
+                return _scriptScope;
+            }
 
             set
             {
@@ -1615,7 +1618,10 @@ internal Language.TypeResolutionState TypeResolutionState
                 return Parent != null ? Parent.TypeResolutionState : Language.TypeResolutionState.UsingSystem;
             }
 
-            set { _typeResolutionState = value; }
+            set
+            {
+                _typeResolutionState = value;
+            }
         }
 
         internal IDictionary<string, Type> TypeTable { get; private set; }
diff --git a/src/System.Management.Automation/engine/ShellVariable.cs b/src/System.Management.Automation/engine/ShellVariable.cs
index f8a32fca917..424be295346 100644
--- a/src/System.Management.Automation/engine/ShellVariable.cs
+++ b/src/System.Management.Automation/engine/ShellVariable.cs
@@ -759,7 +759,10 @@ public LocalVariable(string name, MutableTuple tuple, int tupleSlot)
 
         public override ScopedItemOptions Options
         {
-            get { return base.Options; }
+            get
+            {
+                return base.Options;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/hostifaces/InformationalRecord.cs b/src/System.Management.Automation/engine/hostifaces/InformationalRecord.cs
index 510cb8f9544..3fdba5569c3 100644
--- a/src/System.Management.Automation/engine/hostifaces/InformationalRecord.cs
+++ b/src/System.Management.Automation/engine/hostifaces/InformationalRecord.cs
@@ -59,7 +59,10 @@ public string Message
                 return _message;
             }
 
-            set { _message = value; }
+            set
+            {
+                _message = value;
+            }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
index 1743e6d4678..06ef251dbd6 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
@@ -390,7 +390,10 @@ public bool IsOpen
         /// </summary>
         public int DataAddedCount
         {
-            get { return _dataAddedFrequency; }
+            get
+            {
+                return _dataAddedFrequency;
+            }
 
             set
             {
@@ -2028,7 +2031,10 @@ internal PSInformationalBuffers(Guid psInstanceId)
         /// </summary>
         internal PSDataCollection<ProgressRecord> Progress
         {
-            get { return progress; }
+            get
+            {
+                return progress;
+            }
 
             set
             {
@@ -2044,7 +2050,10 @@ internal PSDataCollection<ProgressRecord> Progress
         /// </summary>
         internal PSDataCollection<VerboseRecord> Verbose
         {
-            get { return verbose; }
+            get
+            {
+                return verbose;
+            }
 
             set
             {
@@ -2060,7 +2069,10 @@ internal PSDataCollection<VerboseRecord> Verbose
         /// </summary>
         internal PSDataCollection<DebugRecord> Debug
         {
-            get { return debug; }
+            get
+            {
+                return debug;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
index 6a2adf3cf69..aac3acfbdf8 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
@@ -276,7 +276,10 @@ public virtual RunspaceConnectionInfo ConnectionInfo
         /// </summary>
         public TimeSpan CleanupInterval
         {
-            get { return _cleanupInterval; }
+            get
+            {
+                return _cleanupInterval;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
index aaee75d0234..d52f1fc6840 100644
--- a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
+++ b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
@@ -35,7 +35,10 @@ internal sealed class LocalVariable
 
         public bool IsBoxed
         {
-            get { return (_flags & IsBoxedFlag) != 0; }
+            get
+            {
+                return (_flags & IsBoxedFlag) != 0;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 5d632d55a38..794b2834331 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -926,7 +926,10 @@ internal Type MemberFunctionReturnType
                 return _memberFunctionReturnType;
             }
 
-            set { _memberFunctionReturnType = value; }
+            set
+            {
+                _memberFunctionReturnType = value;
+            }
         }
 
         private Type _memberFunctionReturnType;
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index fb753652c93..14837fd1c5c 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -1467,7 +1467,10 @@ internal void ForgetFailure()
         /// </exception>
         internal PipelineReader<object> ExternalInput
         {
-            get { return _externalInputPipe; }
+            get
+            {
+                return _externalInputPipe;
+            }
 
             set
             {
@@ -1493,7 +1496,10 @@ internal PipelineReader<object> ExternalInput
         /// </exception>
         internal PipelineWriter ExternalSuccessOutput
         {
-            get { return _externalSuccessOutput; }
+            get
+            {
+                return _externalSuccessOutput;
+            }
 
             set
             {
@@ -1520,7 +1526,10 @@ internal PipelineWriter ExternalSuccessOutput
         /// </exception>
         internal PipelineWriter ExternalErrorOutput
         {
-            get { return _externalErrorOutput; }
+            get
+            {
+                return _externalErrorOutput;
+            }
 
             set
             {
@@ -1567,7 +1576,10 @@ internal LocalPipeline LocalPipeline
         /// </summary>
         internal SessionStateScope ExecutionScope
         {
-            get { return _executionScope; }
+            get
+            {
+                return _executionScope;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index 8e876902c26..5eb392fd8a4 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -670,7 +670,10 @@ public IList<Job> ChildJobs
         /// </summary>
         public string PSJobTypeName
         {
-            get { return _jobTypeName; }
+            get
+            {
+                return _jobTypeName;
+            }
 
             protected internal set
             {
@@ -2288,7 +2291,10 @@ public override string StatusMessage
         /// </summary>
         internal bool HideComputerName
         {
-            get { return _hideComputerName; }
+            get
+            {
+                return _hideComputerName;
+            }
 
             set
             {
@@ -2936,7 +2942,10 @@ public override string Location
         /// </summary>
         internal bool HideComputerName
         {
-            get { return _hideComputerName; }
+            get
+            {
+                return _hideComputerName;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/client/Job2.cs b/src/System.Management.Automation/engine/remoting/client/Job2.cs
index 37776ef2a4b..ae5976ec9f8 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job2.cs
@@ -533,7 +533,10 @@ public sealed class ContainerParentJob : Job2
 
         internal PSEventManager EventManager
         {
-            get { return _eventManager; }
+            get
+            {
+                return _eventManager;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index bbb2056189c..db5d12676c0 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -669,7 +669,10 @@ public virtual PSSessionOption SessionOption
                 return _sessionOption;
             }
 
-            set { _sessionOption = value; }
+            set
+            {
+                _sessionOption = value;
+            }
         }
 
         private PSSessionOption _sessionOption;
@@ -707,7 +710,10 @@ public virtual AuthenticationMechanism Authentication
         [Parameter(ParameterSetName = NewPSSessionCommand.UriParameterSet)]
         public virtual string CertificateThumbprint
         {
-            get { return _thumbPrint; }
+            get
+            {
+                return _thumbPrint;
+            }
 
             set
             {
@@ -4353,7 +4359,10 @@ public PSSessionOption()
         /// </summary>
         public AuthenticationMechanism ProxyAuthentication
         {
-            get { return _proxyAuthentication; }
+            get
+            {
+                return _proxyAuthentication;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs b/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
index 750edca6d7b..97585f1de1b 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
@@ -281,7 +281,10 @@ public SwitchParameter AutoRemoveJob
         [Parameter()]
         public SwitchParameter WriteEvents
         {
-            get { return _writeStateChangedEvents; }
+            get
+            {
+                return _writeStateChangedEvents;
+            }
 
             set
             {
@@ -294,7 +297,10 @@ public SwitchParameter WriteEvents
         [Parameter()]
         public SwitchParameter WriteJobInResults
         {
-            get { return _outputJobFirst; }
+            get
+            {
+                return _outputJobFirst;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
index 29e6640279f..90e10bb8f44 100644
--- a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
@@ -505,7 +505,10 @@ public virtual ScriptBlock InitializationScript
         [ValidateNotNullOrEmpty]
         public virtual Version PSVersion
         {
-            get { return _psVersion; }
+            get
+            {
+                return _psVersion;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
index 0ad23712ee6..d1fc8ef531a 100644
--- a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
@@ -78,7 +78,10 @@ public class GetPSSessionCommand : PSRunspaceCmdlet, IDisposable
                    ParameterSetName = GetPSSessionCommand.ComputerInstanceIdParameterSet)]
         public string ApplicationName
         {
-            get { return _appName; }
+            get
+            {
+                return _appName;
+            }
 
             set
             {
@@ -202,7 +205,10 @@ public override Guid[] InstanceId
         [Credential()]
         public PSCredential Credential
         {
-            get { return _psCredential; }
+            get
+            {
+                return _psCredential;
+            }
 
             set
             {
@@ -223,7 +229,10 @@ public PSCredential Credential
         [Parameter(ParameterSetName = GetPSSessionCommand.ConnectionUriInstanceIdParameterSet)]
         public AuthenticationMechanism Authentication
         {
-            get { return _authentication; }
+            get
+            {
+                return _authentication;
+            }
 
             set
             {
@@ -245,7 +254,10 @@ public AuthenticationMechanism Authentication
         [Parameter(ParameterSetName = GetPSSessionCommand.ConnectionUriInstanceIdParameterSet)]
         public string CertificateThumbprint
         {
-            get { return _thumbprint; }
+            get
+            {
+                return _thumbprint;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index 3122d7e1176..625bb86fd64 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -91,7 +91,10 @@ public class NewPSSessionCommand : PSRemotingBaseCmdlet, IDisposable
         [Credential()]
         public override PSCredential Credential
         {
-            get { return base.Credential; }
+            get
+            {
+                return base.Credential;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 9debc89ce76..202e3ad9fe8 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -208,7 +208,10 @@ public CultureInfo UICulture
         /// </summary>
         public int OpenTimeout
         {
-            get { return _openTimeout; }
+            get
+            {
+                return _openTimeout;
+            }
 
             set
             {
@@ -598,7 +601,10 @@ public override AuthenticationMechanism AuthenticationMechanism
         /// </summary>
         public override string CertificateThumbprint
         {
-            get { return _thumbPrint; }
+            get
+            {
+                return _thumbPrint;
+            }
 
             set
             {
@@ -675,7 +681,10 @@ public override string CertificateThumbprint
         /// </summary>
         public AuthenticationMechanism ProxyAuthentication
         {
-            get { return _proxyAuthentication; }
+            get
+            {
+                return _proxyAuthentication;
+            }
 
             set
             {
@@ -702,7 +711,10 @@ public AuthenticationMechanism ProxyAuthentication
         /// </summary>
         public PSCredential ProxyCredential
         {
-            get { return _proxyCredential; }
+            get
+            {
+                return _proxyCredential;
+            }
 
             set
             {
@@ -1545,7 +1557,10 @@ public override string ComputerName
         /// </summary>
         public override PSCredential Credential
         {
-            get { return _credential; }
+            get
+            {
+                return _credential;
+            }
 
             set
             {
@@ -1667,7 +1682,10 @@ public int ProcessId
         /// </summary>
         public string AppDomainName
         {
-            get { return _appDomainName; }
+            get
+            {
+                return _appDomainName;
+            }
 
             set
             {
@@ -1778,7 +1796,10 @@ public override string ComputerName
         /// </summary>
         public override PSCredential Credential
         {
-            get { return _credential; }
+            get
+            {
+                return _credential;
+            }
 
             set
             {
@@ -2761,7 +2782,10 @@ public override string CertificateThumbprint
         /// </summary>
         public override PSCredential Credential
         {
-            get { return _credential; }
+            get
+            {
+                return _credential;
+            }
 
             set
             {
@@ -2886,7 +2910,10 @@ public override string CertificateThumbprint
         /// </summary>
         public override PSCredential Credential
         {
-            get { return _credential; }
+            get
+            {
+                return _credential;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
index 4685af1e75d..8517fb059f5 100644
--- a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
+++ b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
@@ -142,7 +142,10 @@ internal FragmentedRemoteObject(byte[] blob, long objectId, long fragmentId,
         /// </summary>
         internal int BlobLength
         {
-            get { return _blobLength; }
+            get
+            {
+                return _blobLength;
+            }
 
             set
             {
@@ -156,7 +159,10 @@ internal int BlobLength
         /// </summary>
         internal byte[] Blob
         {
-            get { return _blob; }
+            get
+            {
+                return _blob;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
index 1bf8afd3dd1..7baebdc98ae 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
@@ -88,7 +88,10 @@ internal PrioritySendDataCollection()
 
         internal Fragmentor Fragmentor
         {
-            get { return _fragmentor; }
+            get
+            {
+                return _fragmentor;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/namespaces/AliasProvider.cs b/src/System.Management.Automation/namespaces/AliasProvider.cs
index 6110b29f997..8782a0d9bb5 100644
--- a/src/System.Management.Automation/namespaces/AliasProvider.cs
+++ b/src/System.Management.Automation/namespaces/AliasProvider.cs
@@ -331,7 +331,10 @@ public class AliasProviderDynamicParameters
         [Parameter]
         public ScopedItemOptions Options
         {
-            get { return _options; }
+            get
+            {
+                return _options;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/namespaces/FunctionProvider.cs b/src/System.Management.Automation/namespaces/FunctionProvider.cs
index 7c5d0a47c29..ea3d9a7509c 100644
--- a/src/System.Management.Automation/namespaces/FunctionProvider.cs
+++ b/src/System.Management.Automation/namespaces/FunctionProvider.cs
@@ -361,7 +361,10 @@ public class FunctionProviderDynamicParameters
         [Parameter]
         public ScopedItemOptions Options
         {
-            get { return _options; }
+            get
+            {
+                return _options;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/utils/RuntimeException.cs b/src/System.Management.Automation/utils/RuntimeException.cs
index c483e460abb..4ba776799e7 100644
--- a/src/System.Management.Automation/utils/RuntimeException.cs
+++ b/src/System.Management.Automation/utils/RuntimeException.cs
@@ -263,7 +263,10 @@ internal static Exception RetrieveException(ErrorRecord errorRecord)
         /// </summary>
         public bool WasThrownFromThrowStatement
         {
-            get { return _thrownByThrowStatement; }
+            get
+            {
+                return _thrownByThrowStatement;
+            }
 
             set
             {
diff --git a/src/System.Management.Automation/utils/StructuredTraceSource.cs b/src/System.Management.Automation/utils/StructuredTraceSource.cs
index 47b6e1b4e1d..5096bf17928 100644
--- a/src/System.Management.Automation/utils/StructuredTraceSource.cs
+++ b/src/System.Management.Automation/utils/StructuredTraceSource.cs
@@ -1457,7 +1457,10 @@ internal TraceSource TraceSource
         /// </summary>
         public PSTraceSourceOptions Options
         {
-            get { return _flags; }
+            get
+            {
+                return _flags;
+            }
 
             set
             {