[pull] master from PowerShell:master

src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.resx

@@ -291,4 +291,25 @@ The defined template is following:
   <data name="LogCountLimitExceeded" xml:space="preserve">
     <value>Log count ({0}) is exceeded Windows Event Log API limit ({1}). Adjust filter to return less log names.</value>
   </data>
+  <data name="ListLogParamHelp" xml:space="preserve">
+    <value>Specifies the event logs. Wildcards are permitted.</value>
+  </data>
+  <data name="GetLogParamHelp" xml:space="preserve">
+    <value>Specifies the event logs that this cmdlet gets events from. Wildcards are permitted.</value>
+  </data>
+  <data name="ListProviderParamHelp" xml:space="preserve">
+    <value>Specifies the event log providers that this cmdlet gets.</value>
+  </data>
+  <data name="GetProviderParamHelp" xml:space="preserve">
+    <value>Specifies the event log providers from which this cmdlet gets events.</value>
+  </data>
+  <data name="PathParamHelp" xml:space="preserve">
+    <value>Specifies the path to the event log files that this cmdlet gets events from.</value>
+  </data>
+  <data name="MaxEventsParamHelp" xml:space="preserve">
+    <value>Specifies the maximum number of events that are returned.</value>
+  </data>
+  <data name="ComputerNameParamHelp" xml:space="preserve">
+    <value>Specifies the name of the computer from which this cmdlet gets data.</value>
+  </data>
 </root>

src/System.Management.Automation/engine/parser/TypeResolver.cs

@@ -745,7 +745,7 @@ internal static class CoreTypes
                     { typeof(Guid),                                        new[] { "guid" } },
                     { typeof(Hashtable),                                   new[] { "hashtable" } },
                     { typeof(int),                                         new[] { "int", "int32" } },
-                    { typeof(Int16),                                       new[] { "short", "int16" } },
+                    { typeof(short),                                       new[] { "short", "int16" } },
                     { typeof(long),                                        new[] { "long", "int64" } },
                     { typeof(CimInstance),                                 new[] { "ciminstance" } },
                     { typeof(CimClass),                                    new[] { "cimclass" } },
@@ -778,9 +778,9 @@ internal static class CoreTypes
                     { typeof(BigInteger),                                  new[] { "bigint" } },
                     { typeof(SecureString),                                new[] { "securestring" } },
                     { typeof(TimeSpan),                                    new[] { "timespan" } },
-                    { typeof(UInt16),                                      new[] { "ushort", "uint16" } },
-                    { typeof(UInt32),                                      new[] { "uint", "uint32" } },
-                    { typeof(UInt64),                                      new[] { "ulong", "uint64" } },
+                    { typeof(ushort),                                      new[] { "ushort", "uint16" } },
+                    { typeof(uint),                                        new[] { "uint", "uint32" } },
+                    { typeof(ulong),                                       new[] { "ulong", "uint64" } },
                     { typeof(Uri),                                         new[] { "uri" } },
                     { typeof(ValidateCountAttribute),                      new[] { "ValidateCount" } },
                     { typeof(ValidateDriveAttribute),                      new[] { "ValidateDrive" } },

src/System.Management.Automation/engine/parser/ast.cs

@@ -7939,7 +7939,7 @@ public override Ast Copy()
 
         /// <summary>
         /// The static type produced after the cast is normally the type named by <see cref="Type"/>, but in some cases
-        /// it may not be, in which, <see cref="Object"/> is assumed.
+        /// it may not be, in which, <see cref="object"/> is assumed.
         /// </summary>
         public override Type StaticType
         {

src/System.Management.Automation/help/HelpCommentsParser.cs

@@ -951,7 +951,7 @@ internal static bool IsCommentHelpText(List<Token> commentBlock)
             var result = new List<Language.Token>();
 
             // Any whitespace between the token and the first comment is allowed.
-            int nextMaxStartLine = Int32.MaxValue;
+            int nextMaxStartLine = int.MaxValue;
 
             for (int i = startIndex; i < tokens.Length; i++)
             {

tools/packaging/packaging.psm1

@@ -121,6 +121,9 @@ function Start-PSPackage {
         elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-alpine-fxdependent") {
             New-PSOptions -Configuration "Release" -Runtime 'fxdependent-noopt-linux-musl-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
         }
+        elseif ($Type.Count -eq 1 -and $Type[0] -eq "deb-arm64") {
+            New-PSOptions -Configuration "Release" -Runtime 'linux-arm64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+        }
         else {
             New-PSOptions -Configuration "Release" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
         }