Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 17 commits into from
Jul 9, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bc7a14a
Upgrade .Net Core 3 SDK from preview5 to preview6 and keep NuGet pack…
bergmeister Jun 13, 2019
0cecfe2
Fix namespace ambiguity between 'System.Management.Automation.AllowNu…
bergmeister Jun 13, 2019
5fbd549
Fix MSI installer by adding the new DLLs
bergmeister Jun 13, 2019
3b79c82
Revert accidental change in SMA for NonBlockingRead
bergmeister Jun 14, 2019
0c46bfa
Fix Startup.Tests.ps1 expectations to expect System.Security.Cryptogr…
bergmeister Jun 14, 2019
4449e78
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jun 17, 2019
2b8add4
Upgrade all NuGet packages except for System.ServiceProcess.ServiceCo…
bergmeister Jun 16, 2019
d68ac15
Update web listener package as well
bergmeister Jun 16, 2019
4f99ea6
Update references in NuGet packages as well to reflect changes
bergmeister Jun 16, 2019
b518c73
Update System.ServiceProcess.ServiceController and Microsoft.Windows.…
bergmeister Jun 17, 2019
5735ed1
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jun 22, 2019
60da779
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jul 1, 2019
e244175
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jul 2, 2019
c86f14a
Revert "Update System.ServiceProcess.ServiceController and Microsoft.…
bergmeister Jul 2, 2019
fd7e52a
Fix installer by removing redundant System.Data.OleDb.dll entry
bergmeister Jul 2, 2019
3c764ee
Remove SuppressMessage attributes to make calls to AllowNullAttribute…
bergmeister Jul 5, 2019
866e27e
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
906 changes: 900 additions & 6 deletions assets/files.wxs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview5-011568"
"version": "3.0.100-preview6-012264"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
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;
Expand Down Expand Up @@ -178,7 +177,6 @@ public object NotePropertyValue
/// </summary>
[Parameter(Mandatory = true, Position = 0, ParameterSetName = NotePropertyMultiMemberSet)]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public IDictionary NotePropertyMembers
{
get { return _property; }
Expand Down
10 changes: 0 additions & 10 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
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;
Expand All @@ -21,15 +20,13 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Text;

using PathType = System.IO.Path;

namespace Microsoft.PowerShell.Commands
{
/// <summary>
/// Languages supported for code generation.
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1724:TypeNamesShouldNotMatchNamespaces")]
public enum Language
{
/// <summary>
Expand Down Expand Up @@ -98,7 +95,6 @@ public string TypeDefinition
/// 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
Expand Down Expand Up @@ -133,15 +129,13 @@ public string[] MemberDefinition
[Parameter(ParameterSetName = FromMemberParameterSetName)]
[ValidateNotNull()]
[Alias("Using")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] UsingNamespace { get; set; } = Array.Empty<string>();

/// <summary>
/// The path to the source code or DLL to load.
/// </summary>
[Parameter(Mandatory = true, Position = 0, ParameterSetName = FromPathParameterSetName)]
[ValidateTrustedData]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] Path
{
get
Expand Down Expand Up @@ -189,7 +183,6 @@ public string[] Path
[Parameter(Mandatory = true, ParameterSetName = FromLiteralPathParameterSetName)]
[Alias("PSPath", "LP")]
[ValidateTrustedData]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] LiteralPath
{
get
Expand Down Expand Up @@ -277,7 +270,6 @@ private void ProcessPaths(List<string> resolvedPaths)
[Parameter(Mandatory = true, ParameterSetName = FromAssemblyNameParameterSetName)]
[Alias("AN")]
[ValidateTrustedData]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] AssemblyName { get; set; }

private bool _loadAssembly = false;
Expand All @@ -298,7 +290,6 @@ private void ProcessPaths(List<string> resolvedPaths)
[Parameter(ParameterSetName = FromPathParameterSetName)]
[Parameter(ParameterSetName = FromLiteralPathParameterSetName)]
[Alias("RA")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] ReferencedAssemblies
{
get { return _referencedAssemblies; }
Expand Down Expand Up @@ -813,7 +804,6 @@ private string ResolveAssemblyName(string assembly, bool isForReferenceAssembly)
// 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;
Expand Down
11 changes: 0 additions & 11 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
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;
Expand All @@ -21,9 +20,6 @@

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
{
Expand Down Expand Up @@ -347,7 +343,6 @@ internal ImplicitRemotingCommandBase()
/// 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
{
Expand Down Expand Up @@ -383,7 +378,6 @@ public string[] CommandName
[AllowNull]
[AllowEmptyCollection]
[Alias("Args")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public object[] ArgumentList
{
get
Expand Down Expand Up @@ -425,8 +419,6 @@ public CommandTypes CommandType
/// 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
Expand Down Expand Up @@ -455,7 +447,6 @@ public string[] Module
/// Gets or sets the FullyQualifiedModule parameter to the cmdlet.
/// </summary>
[Parameter]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
[ValidateNotNull]
public ModuleSpecification[] FullyQualifiedModule
{
Expand Down Expand Up @@ -488,7 +479,6 @@ public ModuleSpecification[] FullyQualifiedModule
/// <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
{
Expand Down Expand Up @@ -534,7 +524,6 @@ public string[] FormatTypeName
/// </summary>
[Parameter(Mandatory = true, Position = 0)]
[ValidateNotNull]
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Runspace")]
public PSSession Session { get; set; }

#endregion Parameters
Expand Down
8 changes: 0 additions & 8 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
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;
Expand All @@ -27,29 +26,25 @@ internal MatchInfoContext()
/// <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>
/// Gets or sets the lines found before a match. Does not include
/// overlapping context and thus can be used to
/// display contiguous match regions.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] DisplayPreContext { get; set; }

/// <summary>
/// Gets or sets the lines found after a match. Does not include
/// overlapping context and thus can be used to
/// display contiguous match regions.
/// </summary>
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] DisplayPostContext { get; set; }

/// <summary>
Expand Down Expand Up @@ -266,7 +261,6 @@ private string FormatLine(string lineStr, int displayLineNumber, string displayP
/// <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>
Expand Down Expand Up @@ -423,7 +417,6 @@ public bool Contains(T item)
throw new NotImplementedException();
}

[SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly")]
public void CopyTo(T[] array, int arrayIndex)
{
if (array == null)
Expand Down Expand Up @@ -1006,7 +999,6 @@ public PSObject InputObject
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "LiteralFile")]
[FileinfoToString]
[Alias("PSPath", "LP")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] LiteralPath
{
get => Path;
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -172,7 +171,6 @@ public sealed class WriteInformationCommand : PSCmdlet
/// Any tags to be associated with this information.
/// </summary>
[Parameter(Position = 1)]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] Tags { get; set; }

/// <summary>
Expand Down
10 changes: 0 additions & 10 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
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;
using System.Management.Automation.Internal;
using System.Security;
using System.Text;
using System.Xml;

using Dbg = System.Management.Automation.Diagnostics;

namespace Microsoft.PowerShell.Commands
Expand Down Expand Up @@ -293,7 +291,6 @@ public sealed class ImportClixmlCommand : PSCmdlet, IDisposable
/// </summary>
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = "ByLiteralPath")]
[Alias("PSPath", "LP")]
[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
public string[] LiteralPath
{
get
Expand Down Expand Up @@ -811,7 +808,6 @@ public class SelectXmlCommand : PSCmdlet
/// <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")]
Expand All @@ -821,7 +817,6 @@ public class SelectXmlCommand : PSCmdlet
/// <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")]
Expand All @@ -845,16 +840,13 @@ public string[] LiteralPath
[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; }

/// <summary>
/// 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]
Expand All @@ -874,7 +866,6 @@ public string[] LiteralPath
/// </summary>
[Parameter]
[ValidateNotNullOrEmpty]
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public Hashtable Namespace { get; set; }

#endregion parameters
Expand Down Expand Up @@ -1100,7 +1091,6 @@ public sealed class SelectXmlInfo
/// <summary>
/// The XmlNode that matches search.
/// </summary>
[SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", MessageId = "System.Xml.XmlNode")]
public XmlNode Node { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 10 additions & 10 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading