maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Upgrade .Net Core 3 SDK from preview5 to preview6 and related out of band Nuget packages from 2.1 to 3.0-preview6 (#9888)

Browse source
This commit is contained in:
Christoph Bergmeister [MVP] 2019-07-09 22:35:08 +01:00 committed by Dongbo Wang
parent ffc3af2b5d
commit fe56f9d902
23 changed files with 930 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

906
assets/files.wxs
View file

File diff suppressed because it is too large Load diff

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview5-011568"
"version": "3.0.100-preview6-012264"
}
}

2
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -56,7 +56,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.1.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="NJsonSchema" Version="10.0.21" />
</ItemGroup>

2
src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
View file

@ -5,7 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Management.Automation;
using System.Management.Automation.Host;
@ -178,7 +177,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter(Mandatory = true, Position = 0, ParameterSetName = NotePropertyMultiMemberSet)]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public IDictionary NotePropertyMembers
{
get { return _property; }

10
src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
View file

@ -6,7 +6,6 @@ using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Linq;
@ -21,7 +20,6 @@ using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Text;
using PathType = System.IO.Path;
namespace Microsoft.PowerShell.Commands
@ -29,7 +27,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Languages supported for code generation.
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1724:TypeNamesShouldNotMatchNamespaces")]
public enum Language
{
/// <summary>
@ -98,7 +95,6 @@ namespace Microsoft.PowerShell.Commands
/// The source code of this generated method / member.
/// </summary>
[Parameter(Mandatory = true, Position = 1, ParameterSetName = FromMemberParameterSetName)]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] MemberDefinition
{
get
@ -133,7 +129,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter(ParameterSetName = FromMemberParameterSetName)]
[ValidateNotNull()]
[Alias("Using")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] UsingNamespace { get; set; } = Array.Empty<string>();
/// <summary>
@ -141,7 +136,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter(Mandatory = true, Position = 0, ParameterSetName = FromPathParameterSetName)]
[ValidateTrustedData]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] Path
{
get
@ -189,7 +183,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter(Mandatory = true, ParameterSetName = FromLiteralPathParameterSetName)]
[Alias("PSPath", "LP")]
[ValidateTrustedData]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] LiteralPath
{
get
@ -277,7 +270,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter(Mandatory = true, ParameterSetName = FromAssemblyNameParameterSetName)]
[Alias("AN")]
[ValidateTrustedData]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] AssemblyName { get; set; }
private bool _loadAssembly = false;
@ -298,7 +290,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter(ParameterSetName = FromPathParameterSetName)]
[Parameter(ParameterSetName = FromLiteralPathParameterSetName)]
[Alias("RA")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] ReferencedAssemblies
{
get { return _referencedAssemblies; }
@ -813,7 +804,6 @@ namespace Microsoft.PowerShell.Commands
// However, this does give us a massive usability improvement, as users can just say
// Add-Type -AssemblyName Forms (instead of System.Windows.Forms)
// This is just long, not unmaintainable.
[SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode")]
private Assembly LoadAssemblyHelper(string assemblyName)
{
Assembly loadedAssembly = null;

11
src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
View file

@ -5,7 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Management.Automation;
@ -21,9 +20,6 @@ using System.Xml;
using Dbg = System.Management.Automation.Diagnostics;
// FxCop suppressions for resource strings:
[module: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", Scope = "resource", Target = "ImplicitRemotingStrings.resources", MessageId = "runspace")]
[module: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", Scope = "resource", Target = "ImplicitRemotingStrings.resources", MessageId = "Runspace")]
namespace Microsoft.PowerShell.Commands
{
@ -347,7 +343,6 @@ namespace Microsoft.PowerShell.Commands
/// Gets or sets the path(s) or name(s) of the commands to retrieve.
/// </summary>
[Parameter(Position = 2)]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Alias("Name")]
public string[] CommandName
{
@ -383,7 +378,6 @@ namespace Microsoft.PowerShell.Commands
[AllowNull]
[AllowEmptyCollection]
[Alias("Args")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public object[] ArgumentList
{
get
@ -425,8 +419,6 @@ namespace Microsoft.PowerShell.Commands
/// Gets or sets the PSSnapin parameter to the cmdlet.
/// </summary>
[Parameter]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Snapin")]
[Alias("PSSnapin")]
[ValidateNotNull]
public string[] Module
@ -455,7 +447,6 @@ namespace Microsoft.PowerShell.Commands
/// Gets or sets the FullyQualifiedModule parameter to the cmdlet.
/// </summary>
[Parameter]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[ValidateNotNull]
public ModuleSpecification[] FullyQualifiedModule
{
@ -488,7 +479,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets the types for which we should get formatting and output data.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 3)]
public string[] FormatTypeName
{
@ -534,7 +524,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter(Mandatory = true, Position = 0)]
[ValidateNotNull]
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Runspace")]
public PSSession Session { get; set; }
#endregion Parameters

8
src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
View file

@ -5,7 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Management.Automation;
@ -27,13 +26,11 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets the lines found before a match.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] PreContext { get; set; }
/// <summary>
/// Gets or sets the lines found after a match.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] PostContext { get; set; }
/// <summary>
@ -41,7 +38,6 @@ namespace Microsoft.PowerShell.Commands
/// overlapping context and thus can be used to
/// display contiguous match regions.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] DisplayPreContext { get; set; }
/// <summary>
@ -49,7 +45,6 @@ namespace Microsoft.PowerShell.Commands
/// overlapping context and thus can be used to
/// display contiguous match regions.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] DisplayPostContext { get; set; }
/// <summary>
@ -266,7 +261,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets a list of all Regex matches on the matching line.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public Match[] Matches { get; set; } = new Match[] { };
/// <summary>
@ -423,7 +417,6 @@ namespace Microsoft.PowerShell.Commands
throw new NotImplementedException();
}
[SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly")]
public void CopyTo(T[] array, int arrayIndex)
{
if (array == null)
@ -1006,7 +999,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "LiteralFile")]
[FileinfoToString]
[Alias("PSPath", "LP")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] LiteralPath
{
get => Path;

2
src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
View file

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Threading;
@ -17,7 +16,6 @@ namespace Microsoft.PowerShell.Commands
/// This command converts an object to a Json string representation.
/// </summary>
[Cmdlet(VerbsData.ConvertTo, "Json", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=217032", RemotingCapability = RemotingCapability.None)]
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
public class ConvertToJsonCommand : PSCmdlet
{
/// <summary>

2
src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
View file

@ -2,7 +2,6 @@
// Licensed under the MIT License.
using System;
using System.Diagnostics.CodeAnalysis;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Runtime.Serialization;
@ -172,7 +171,6 @@ namespace Microsoft.PowerShell.Commands
/// Any tags to be associated with this information.
/// </summary>
[Parameter(Position = 1)]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] Tags { get; set; }
/// <summary>

10
src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
View file

@ -5,7 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Management.Automation;
@ -13,7 +12,6 @@ using System.Management.Automation.Internal;
using System.Security;
using System.Text;
using System.Xml;
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
@ -293,7 +291,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "ByLiteralPath")]
[Alias("PSPath", "LP")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] LiteralPath
{
get
@ -811,7 +808,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Specifies the path which contains the xml files. The default is the current user directory.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 1, Mandatory = true,
ValueFromPipelineByPropertyName = true,
ParameterSetName = "Path")]
@ -821,7 +817,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Specifies the literal path which contains the xml files. The default is the current user directory.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "LiteralPath")]
[ValidateNotNullOrEmpty]
[Alias("PSPath", "LP")]
@ -845,8 +840,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, ValueFromPipeline = true,
ParameterSetName = "Xml")]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", MessageId = "System.Xml.XmlNode")]
[Alias("Node")]
public System.Xml.XmlNode[] Xml { get; set; }
@ -854,7 +847,6 @@ namespace Microsoft.PowerShell.Commands
/// The following is the definition of the input parameter in string format.
/// Specifies the string format of a fully qualified xml.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Mandatory = true, ValueFromPipeline = true,
ParameterSetName = "Content")]
[ValidateNotNullOrEmpty]
@ -874,7 +866,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public Hashtable Namespace { get; set; }
#endregion parameters
@ -1100,7 +1091,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// The XmlNode that matches search.
/// </summary>
[SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", MessageId = "System.Xml.XmlNode")]
public XmlNode Node { get; set; }
/// <summary>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview6.19303.8" />
</ItemGroup>
</Project>

20
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

@ -16,18 +16,18 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview6.19303.8" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
<PackageReference Include="System.IO.Packaging" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview6.19303.8" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.Http" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.Security" Version="4.5.3" />
<PackageReference Include="System.Private.ServiceModel" Version="4.5.3" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview6.final" />
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview6.final" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="2.1.1" />

3
src/Microsoft.PowerShell.Security/security/CmsCommands.cs
View file

@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Management.Automation;
using System.Security.Cryptography.Pkcs;
@ -26,7 +25,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets the recipient of the CMS Message.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 0, Mandatory = true)]
public CmsMessageRecipient[] To
{
@ -402,7 +400,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets the recipient of the CMS Message.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 1)]
public CmsMessageRecipient[] To
{

20
src/System.Management.Automation/System.Management.Automation.csproj
View file

@ -11,16 +11,16 @@
<!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
<PackageReference Include="System.DirectoryServices" Version="4.5.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.5.2" />
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Management" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview6.19303.8" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.1" />

3
src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
View file

@ -5,11 +5,9 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
@ -23,7 +21,6 @@ using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Cmdletization
{
[SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling")]
internal sealed class ScriptWriter
{
#region Static code reused for reading cmdletization xml

7
src/System.Management.Automation/engine/GetCommandCommand.cs
View file

@ -6,15 +6,12 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Management.Automation.Language;
using System.Reflection;
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
@ -124,7 +121,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets the PSSnapin/Module parameter to the cmdlet.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
[Parameter(ValueFromPipelineByPropertyName = true)]
[Alias("PSSnapin")]
public string[] Module
@ -154,7 +150,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// Gets or sets the FullyQualifiedModule parameter to the cmdlet.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
[Parameter(ValueFromPipelineByPropertyName = true)]
public ModuleSpecification[] FullyQualifiedModule
{
@ -283,7 +278,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] ParameterName
{
get { return _parameterNames; }
@ -311,7 +305,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public PSTypeName[] ParameterType
{
get

12
src/System.Management.Automation/engine/InternalCommands.cs
View file

@ -4,17 +4,14 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Dynamic;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Management.Automation.Language;
using System.Runtime.CompilerServices;
using System.Text;
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
@ -57,7 +54,6 @@ namespace Microsoft.PowerShell.Commands
/// Implements a cmdlet that applies a script block
/// to each element of the pipeline.
/// </summary>
[SuppressMessage("Microsoft.PowerShell", "PS1012:CallShouldProcessOnlyIfDeclaringSupport")]
[Cmdlet("ForEach", "Object", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.Low,
DefaultParameterSetName = "ScriptBlockSet", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=113300",
RemotingCapability = RemotingCapability.None)]
@ -143,7 +139,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// The remaining script blocks to apply.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
[Parameter(ParameterSetName = "ScriptBlockSet", ValueFromRemainingArguments = true)]
[AllowNull]
[AllowEmptyCollection]
@ -186,7 +181,6 @@ namespace Microsoft.PowerShell.Commands
/// <summary>
/// The arguments passed to a method invocation.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
[Parameter(ParameterSetName = "PropertyAndMethodSet", ValueFromRemainingArguments = true)]
[ValidateTrustedData]
[Alias("Args")]
@ -1022,7 +1016,6 @@ namespace Microsoft.PowerShell.Commands
/// Case sensitive binary operator -ceq.
/// </summary>
[Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveEqualSet")]
[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "CEQ")]
public SwitchParameter CEQ
{
set { _binaryOperator = TokenKind.Ceq; }
@ -1046,7 +1039,6 @@ namespace Microsoft.PowerShell.Commands
/// Case sensitive binary operator -cne.
/// </summary>
[Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveNotEqualSet")]
[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "CNE")]
public SwitchParameter CNE
{
set { _binaryOperator = TokenKind.Cne; }
@ -1070,7 +1062,6 @@ namespace Microsoft.PowerShell.Commands
/// Case sensitive binary operator -cgt.
/// </summary>
[Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveGreaterThanSet")]
[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "CGT")]
public SwitchParameter CGT
{
set { _binaryOperator = TokenKind.Cgt; }
@ -1094,7 +1085,6 @@ namespace Microsoft.PowerShell.Commands
/// Case sensitive binary operator -clt.
/// </summary>
[Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveLessThanSet")]
[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "CLT")]
public SwitchParameter CLT
{
set { _binaryOperator = TokenKind.Clt; }
@ -1118,7 +1108,6 @@ namespace Microsoft.PowerShell.Commands
/// Case sensitive binary operator -cge.
/// </summary>
[Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveGreaterOrEqualSet")]
[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "CGE")]
public SwitchParameter CGE
{
set { _binaryOperator = TokenKind.Cge; }
@ -1142,7 +1131,6 @@ namespace Microsoft.PowerShell.Commands
/// Case sensitive binary operator -cle.
/// </summary>
[Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveLessOrEqualSet")]
[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "CLE")]
public SwitchParameter CLE
{
set { _binaryOperator = TokenKind.Cle; }

32
src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
View file

@ -5,7 +5,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Linq;
@ -13,7 +12,6 @@ using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Reflection;
using System.Text;
using Dbg = System.Management.Automation.Diagnostics;
//
@ -49,7 +47,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public object[] NestedModules
{
get { return _nestedModules; }
@ -240,8 +237,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[ArgumentTypeConverter(typeof(ModuleSpecification[]))]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public object[] RequiredModules
{
get { return _requiredModules; }
@ -256,8 +251,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] TypesToProcess
{
get { return _types; }
@ -272,8 +265,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] FormatsToProcess
{
get { return _formats; }
@ -288,8 +279,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] ScriptsToProcess
{
get { return _scripts; }
@ -304,8 +293,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] RequiredAssemblies
{
get { return _requiredAssemblies; }
@ -320,8 +307,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] FileList
{
get { return _miscFiles; }
@ -338,8 +323,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter]
[AllowEmptyCollection]
[ArgumentTypeConverter(typeof(ModuleSpecification[]))]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public object[] ModuleList
{
get { return _moduleList; }
@ -354,8 +337,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] FunctionsToExport
{
get { return _exportedFunctions; }
@ -370,8 +351,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] AliasesToExport
{
get { return _exportedAliases; }
@ -386,8 +365,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] VariablesToExport
{
get { return _exportedVariables; }
@ -402,8 +379,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] CmdletsToExport
{
get { return _exportedCmdlets; }
@ -418,8 +393,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowEmptyCollection]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] DscResourcesToExport
{
get { return _dscResourcesToExport; }
@ -435,8 +408,6 @@ namespace Microsoft.PowerShell.Commands
[Parameter]
[AllowEmptyCollection]
[ValidateSet("Desktop", "Core")]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] CompatiblePSEditions
{
get { return _compatiblePSEditions; }
@ -465,8 +436,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter(Mandatory = false)]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Performance",
"CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
public string[] Tags { get; set; }
/// <summary>
@ -522,7 +491,6 @@ namespace Microsoft.PowerShell.Commands
/// </summary>
[Parameter]
[AllowNull]
[SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings")]
public string HelpInfoUri
{
get { return _helpInfoUri; }

10
src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
View file

@ -4,12 +4,10 @@
using System;
using System.Collections;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Security.AccessControl;
using System.Text;
using System.Threading;
using System.Management.Automation;
using System.Management.Automation.Internal;
@ -21,7 +19,6 @@ using Dbg = System.Management.Automation.Diagnostics;
using WSManNativeApi = System.Management.Automation.Remoting.Client.WSManNativeApi;
using PowerShellApi = System.Management.Automation.PowerShell;
using Microsoft.Win32;
using System.Security;
using System.Collections.Generic;
using System.Security.Principal;
@ -2204,7 +2201,6 @@ else
/// This enables the user to specify an SDDL on the shell.
/// The default SDDL is the default used by Wsman.
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sddl")]
[Parameter()]
public string SecurityDescriptorSddl
{
@ -2351,7 +2347,6 @@ else
/// </summary>
[Parameter(ParameterSetName = NameParameterSetName)]
[Parameter(ParameterSetName = AssemblyNameParameterSetName)]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public object[] ModulesToImport
{
get
@ -2847,7 +2842,6 @@ $args[0] | ForEach-Object {{
/// <summary>
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 0, Mandatory = false)]
[ValidateNotNullOrEmpty()]
public string[] Name { get; set; }
@ -4270,7 +4264,6 @@ $_ | Enable-PSSessionConfiguration -force $args[0] -sddl $args[1] -isSDDLSpecifi
/// <summary>
/// Configurations to Enable.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 0, ValueFromPipeline = true, ValueFromPipelineByPropertyName = true)]
[ValidateNotNullOrEmpty]
public string[] Name { get; set; }
@ -4302,7 +4295,6 @@ $_ | Enable-PSSessionConfiguration -force $args[0] -sddl $args[1] -isSDDLSpecifi
/// This enables the user to specify an SDDL for whom the session
/// configuration is enabled.
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sddl")]
[Parameter()]
public string SecurityDescriptorSddl
{
@ -4558,7 +4550,6 @@ $_ | Disable-PSSessionConfiguration -force $args[0] -whatif:$args[1] -confirm:$a
/// <summary>
/// Configurations to Enable.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[Parameter(Position = 0, ValueFromPipeline = true, ValueFromPipelineByPropertyName = true)]
[ValidateNotNullOrEmpty]
public string[] Name { get; set; }
@ -5498,7 +5489,6 @@ namespace Microsoft.PowerShell.Commands.Internal
/// <summary>
/// This class is public for implementation reasons only and should not be used.
/// </summary>
[SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes", Justification = "Needed for resources from scripts")]
public static class RemotingErrorResources
{
/// <summary>

4
test/powershell/Host/Startup.Tests.ps1
View file

@ -58,9 +58,7 @@ Describe "Validate start of console host" -Tag CI {
'System.Runtime.Serialization.Primitives.dll'
'System.Security.AccessControl.dll'
'System.Security.Cryptography.Encoding.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Security.Cryptography.X509Certificates.dll'
'System.Security.Principal.dll'
'System.Security.Principal.Windows.dll'
'System.Text.Encoding.Extensions.dll'
'System.Text.RegularExpressions.dll'
@ -80,6 +78,8 @@ Describe "Validate start of console host" -Tag CI {
'System.DirectoryServices.dll'
'System.Management.dll'
'System.Security.Claims.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Security.Principal.dll'
'System.Threading.Overlapped.dll'
)
}

4
test/tools/WebListener/WebListener.csproj
View file

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview5-19227-01" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview6.19303.8" />
</ItemGroup>
<ItemGroup>

2
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview6.19303.8" />
</ItemGroup>
</Project>

4
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview6.19303.8" />
</ItemGroup>
</Project>