PowerShell · adityapatwardhan · Aug 7, 2023 · Jul 17, 2023 · Jul 17, 2023 · Jul 17, 2023
@@ -80,11 +80,6 @@ stages:
     parameters:
       channel: preview
       architecture: x86
-  - template: templates/windows-packaging.yml
-    parameters:
-      channel: preview
-      architecture: arm
-      runtimePrefix: win
   - template: templates/windows-packaging.yml
     parameters:
       channel: preview

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.4.23260.5"
+    "version": "8.0.100-preview.6.23330.14"
   }
 }
diff --git a/...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -734,7 +734,7 @@ protected override void ProcessRecord()
 
         /// <summary>
         /// Disposes the associated WebSession if it is not being used as part of a persistent session.
-        /// </summary> 
+        /// </summary>
         /// <param name="disposing">True when called from Dispose() and false when called from finalizer.</param>
         protected virtual void Dispose(bool disposing)
         {
@@ -752,7 +752,7 @@ protected virtual void Dispose(bool disposing)
 
         /// <summary>
         /// Disposes the associated WebSession if it is not being used as part of a persistent session.
-        /// </summary> 
+        /// </summary>
         public void Dispose()
         {
             Dispose(disposing: true);
@@ -1716,7 +1716,7 @@ internal void ParseLinkHeader(HttpResponseMessage response)
         /// <param name="fieldValue">The Field Value to use.</param>
         /// <param name="formData">The <see cref="MultipartFormDataContent"/> to update.</param>
         /// <param name="enumerate">If true, collection types in <paramref name="fieldValue"/> will be enumerated. If false, collections will be treated as single value.</param>
-        private void AddMultipartContent(object fieldName, object fieldValue, MultipartFormDataContent formData, bool enumerate)
+        private static void AddMultipartContent(object fieldName, object fieldValue, MultipartFormDataContent formData, bool enumerate)
         {
             ArgumentNullException.ThrowIfNull(formData);
 

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -458,9 +458,7 @@ internal override
         /// <returns>
         /// The found node, or null if no suitable node was located.
         /// </returns>
-        private
-        ProgressNode
-        FindOldestNodeOfGivenStyle(ArrayList nodes, int oldestSoFar, ProgressNode.RenderStyle style)
+        private static ProgressNode FindOldestNodeOfGivenStyle(ArrayList nodes, int oldestSoFar, ProgressNode.RenderStyle style)
         {
             if (nodes == null)
             {
@@ -631,9 +629,7 @@ internal override
         /// <param name="rawUI">
         /// The PSHostRawUserInterface used to gauge string widths in the rendering.
         /// </param>
-        private
-        void
-        RenderHelper(ArrayList strings, ArrayList nodes, int indentation, int maxWidth, PSHostRawUserInterface rawUI)
+        private static void RenderHelper(ArrayList strings, ArrayList nodes, int indentation, int maxWidth, PSHostRawUserInterface rawUI)
         {
             Dbg.Assert(strings != null, "strings should not be null");
             Dbg.Assert(nodes != null, "nodes should not be null");
@@ -721,9 +717,7 @@ private int TallyHeight(PSHostRawUserInterface rawUi, int maxHeight, int maxWidt
         /// <param name="nodes"></param>
         /// <param name="style"></param>
         /// <returns></returns>
-        private
-        bool
-        AllNodesHaveGivenStyle(ArrayList nodes, ProgressNode.RenderStyle style)
+        private static bool AllNodesHaveGivenStyle(ArrayList nodes, ProgressNode.RenderStyle style)
         {
             if (nodes == null)
             {

diff --git a/src/System.Management.Automation/engine/ComInterop/VarEnumSelector.cs b/src/System.Management.Automation/engine/ComInterop/VarEnumSelector.cs
@@ -352,7 +352,7 @@ private static bool TryGetPrimitiveComTypeViaConversion(Type argumentType, out V
         // We will try VT_DISPATCH and then call GetNativeVariantForObject.
         private const VarEnum VT_DEFAULT = VarEnum.VT_RECORD;
 
-        private VarEnum GetComType(ref Type argumentType)
+        private static VarEnum GetComType(ref Type argumentType)
         {
             if (argumentType == typeof(Missing))
             {
@@ -431,7 +431,7 @@ private VarEnum GetComType(ref Type argumentType)
         /// <summary>
         /// Get the COM Variant type that argument should be marshalled as for a call to COM.
         /// </summary>
-        private VariantBuilder GetVariantBuilder(Type argumentType)
+        private static VariantBuilder GetVariantBuilder(Type argumentType)
         {
             //argumentType is coming from MarshalType, null means the dynamic object holds
             //a null value and not byref

diff --git a/src/System.Management.Automation/engine/Interop/Windows/FindFirstFile.cs b/src/System.Management.Automation/engine/Interop/Windows/FindFirstFile.cs
@@ -41,7 +41,8 @@ internal unsafe struct WIN32_FIND_DATA
 
         internal sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid
         {
-            private SafeFindHandle() : base(true) { }
+            // .NET 8 requires the default constructor to be public
+            public SafeFindHandle() : base(true) { }
 
             protected override bool ReleaseHandle()
             {

diff --git a/src/System.Management.Automation/engine/Modules/RemoveModuleCommand.cs b/src/System.Management.Automation/engine/Modules/RemoveModuleCommand.cs
@@ -291,7 +291,7 @@ private bool ModuleProvidesCurrentSessionDrive(PSModuleInfo module)
             return false;
         }
 
-        private void GetAllNestedModules(PSModuleInfo module, ref List<PSModuleInfo> nestedModulesWithNoCircularReference)
+        private static void GetAllNestedModules(PSModuleInfo module, ref List<PSModuleInfo> nestedModulesWithNoCircularReference)
         {
             List<PSModuleInfo> nestedModules = new List<PSModuleInfo>();
             if (module.NestedModules != null && module.NestedModules.Count > 0)

diff --git a/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs b/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
@@ -431,7 +431,7 @@ public override AstVisitAction VisitCommand(CommandAst commandAst)
             return AstVisitAction.SkipChildren;
         }
 
-        private void ProcessCmdletArguments(object value, Action<string> onEachArgument)
+        private static void ProcessCmdletArguments(object value, Action<string> onEachArgument)
         {
             if (value == null)
             {

diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
@@ -1804,7 +1804,7 @@ internal TypeTableLoadException(ConcurrentBag<string> loadErrors)
         /// </summary>
         /// <param name="info"></param>
         /// <param name="context"></param>
-        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")] 
+        [Obsolete("Legacy serialization support is deprecated since .NET 8", DiagnosticId = "SYSLIB0051")]
         protected TypeTableLoadException(SerializationInfo info, StreamingContext context)
         {
             throw new NotSupportedException();
@@ -4098,7 +4098,7 @@ internal PSObject.AdapterSet GetTypeAdapter(Type type)
 #endif
         }
 
-        private TypeMemberData GetTypeMemberDataFromPSMemberInfo(PSMemberInfo member)
+        private static TypeMemberData GetTypeMemberDataFromPSMemberInfo(PSMemberInfo member)
         {
             var note = member as PSNoteProperty;
             if (note != null)
@@ -4165,7 +4165,7 @@ private TypeMemberData GetTypeMemberDataFromPSMemberInfo(PSMemberInfo member)
         /// </summary>
         /// <param name="member"></param>
         /// <param name="typeData"></param>
-        private void LoadMembersToTypeData(PSMemberInfo member, TypeData typeData)
+        private static void LoadMembersToTypeData(PSMemberInfo member, TypeData typeData)
         {
             Dbg.Assert(member != null, "caller should guarantee that member is not null");
             Dbg.Assert(typeData != null, "caller should guarantee that typeData is not null");
@@ -4201,7 +4201,7 @@ private static T GetParameterType<T>(object sourceValue)
         /// <summary>
         /// Load the standard members into the passed-in TypeData.
         /// </summary>
-        private void LoadStandardMembersToTypeData(PSMemberSet memberSet, TypeData typeData)
+        private static void LoadStandardMembersToTypeData(PSMemberSet memberSet, TypeData typeData)
         {
             foreach (PSMemberInfo member in memberSet.InternalMembers)
             {

diff --git a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
@@ -1357,7 +1357,7 @@ private void CompileThrowUnaryExpression(Expression expr, bool asVoid)
         }
 
         // TODO: remove (replace by true fault support)
-        private bool EndsWithRethrow(Expression expr)
+        private static bool EndsWithRethrow(Expression expr)
         {
             if (expr.NodeType == ExpressionType.Throw)
             {

@@ -553,7 +553,7 @@ public override AstVisitAction VisitTryStatement(TryStatementAst tryStatementAst
                         break;
                     }
 
-                    if (block2.IsCatchAll) 
+                    if (block2.IsCatchAll)
                     {
                         continue;
                     }
@@ -1033,7 +1033,7 @@ public override AstVisitAction VisitUsingExpression(UsingExpressionAst usingExpr
             return AstVisitAction.Continue;
         }
 
-        private ExpressionAst CheckUsingExpression(ExpressionAst exprAst)
+        private static ExpressionAst CheckUsingExpression(ExpressionAst exprAst)
         {
             RuntimeHelpers.EnsureSufficientExecutionStack();
             if (exprAst is VariableExpressionAst)

diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
@@ -6007,7 +6007,7 @@ private static string VerifyKey(object key)
                 typeof(PSPrimitiveDictionary)
             };
 
-        private void VerifyValue(object value)
+        private static void VerifyValue(object value)
         {
             // null is a primitive type
             if (value == null)
@@ -6065,7 +6065,7 @@ private void VerifyValue(object value)
         public override void Add(object key, object value)
         {
             string keyAsString = VerifyKey(key);
-            this.VerifyValue(value);
+            VerifyValue(value);
             base.Add(keyAsString, value);
         }
 
@@ -6093,7 +6093,7 @@ public override object this[object key]
             set
             {
                 string keyAsString = VerifyKey(key);
-                this.VerifyValue(value);
+                VerifyValue(value);
                 base[keyAsString] = value;
             }
         }
@@ -6121,7 +6121,7 @@ public object this[string key]
 
             set
             {
-                this.VerifyValue(value);
+                VerifyValue(value);
                 base[key] = value;
             }
         }

@@ -315,7 +315,7 @@ internal MamlCommandHelpInfo MergeProviderSpecificHelp(PSObject cmdletHelp, PSOb
         /// Name of the property for which text needs to be extracted.
         /// </param>
         /// <returns></returns>
-        private string ExtractTextForHelpProperty(PSObject psObject, string propertyName)
+        private static string ExtractTextForHelpProperty(PSObject psObject, string propertyName)
         {
             if (psObject == null)
                 return string.Empty;
@@ -336,7 +336,7 @@ private string ExtractTextForHelpProperty(PSObject psObject, string propertyName
         /// </summary>
         /// <param name="psObject"></param>
         /// <returns></returns>
-        private string ExtractText(PSObject psObject)
+        private static string ExtractText(PSObject psObject)
         {
             if (psObject == null)
             {

@@ -321,7 +321,7 @@ private Hashtable GetInsideProperties(XmlNode xmlNode)
         /// <param name="xmlNode">
         /// Node whose children are verified for maml.
         /// </param>
-        private void RemoveUnsupportedNodes(XmlNode xmlNode)
+        private static void RemoveUnsupportedNodes(XmlNode xmlNode)
         {
             // Start with the first child..
             // We want to modify only children..

@@ -797,7 +797,7 @@ internal IEnumerable<string> ResolvePath(string path, bool recurse, bool isLiter
         /// </summary>
         /// <param name="path">Path to resolve.</param>
         /// <returns>A list of directories.</returns>
-        private IEnumerable<string> RecursiveResolvePathHelper(string path)
+        private static IEnumerable<string> RecursiveResolvePathHelper(string path)
         {
             if (System.IO.Directory.Exists(path))
             {

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
     <PackageReference Include="Perfolizer" Version="0.3.4" />
   </ItemGroup>

@@ -9,6 +9,7 @@
 
     <!-- Disable deps.json generation -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <NoWarn>NU1902</NoWarn>
 
     <!-- Deploy the produced assembly -->
     <PublishDir>..\..\Modules\IsolatedModule\Dependencies</PublishDir>

@@ -108,10 +108,6 @@ stages:
         parameters:
           Architecture: x86
 
-      - template: templates/windows-hosted-build.yml
-        parameters:
-          Architecture: arm
-
       - template: templates/windows-hosted-build.yml
         parameters:
           Architecture: arm64
@@ -304,11 +300,6 @@ stages:
         Architecture: x86
         parentJob: build_windows_x86_release
 
-    - template: templates/windows-packaging.yml
-      parameters:
-        Architecture: arm
-        parentJob: build_windows_arm_release
-
     - template: templates/windows-packaging.yml
       parameters:
         Architecture: arm64

@@ -61,10 +61,6 @@ stages:
     parameters:
       architecture: x86
 
-  - template: ./templates/vpackReleaseJob.yml
-    parameters:
-      architecture: arm32
-
   - template: ./templates/vpackReleaseJob.yml
     parameters:
       architecture: arm64