From db07a3211beeb3591047d7cdce490c0dd823c46d Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 12 Oct 2016 10:24:08 -0700 Subject: [PATCH 1/6] Update powershell to depend on latest dotnet core packages (preview1-24530-04 from 9/30/2016) --- build.psm1 | 7 +- docs/cmdlet-example/project.json | 4 +- nuget.config | 1 + .../project.json | 88 +++++----- .../project.json | 94 +++++----- .../project.json | 88 +++++----- .../project.json | 126 ++++++------- .../project.json | 128 +++++++------- src/Microsoft.PackageManagement/project.json | 102 +++++------ .../project.json | 6 +- .../project.json | 7 +- .../project.json | 5 +- .../CoreCLR/CorePsAssemblyLoadContext.cs | 5 +- .../project.json | 10 +- .../project.json | 10 +- .../project.json | 2 +- .../project.json | 106 +++++------ src/Microsoft.PowerShell.SDK/project.json | 166 +++++++++--------- src/Microsoft.WSMan.Management/project.json | 3 - src/Microsoft.WSMan.Runtime/project.json | 2 +- src/ResGen/project.json | 4 +- src/System.Management.Automation/project.json | 60 +++---- src/TypeCatalogGen/project.json | 6 +- src/TypeCatalogParser/project.json | 2 +- src/powershell-unix/project.json | 3 +- src/powershell-win-core/project.json | 5 +- test/PSReadLine/project.json | 2 +- test/csharp/project.json | 4 +- test/tools/EchoArgs/project.json | 2 +- 29 files changed, 524 insertions(+), 524 deletions(-) diff --git a/build.psm1 b/build.psm1 index d5746acf0c5..034b1cb4eb9 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2376,7 +2376,12 @@ function Start-CrossGen { throw "crossgen is not available for this platform" } - $crossGenPath = Get-ChildItem $crossGenSearchPath -Recurse | ? { $_.FullName -match $crossGenRuntime } | select -First 1 | % { $_.FullName } + # Get the CrossGen.exe for the correct runtime with the latest version + $crossGenPath = Get-ChildItem $crossGenSearchPath -Recurse | ` + Where-Object { $_.FullName -match $crossGenRuntime } | ` + Sort-Object -Property FullName -Descending | ` + Select-Object -First 1 | ` + ForEach-Object { $_.FullName } if (-not $crossGenPath) { throw "Unable to find latest version of crossgen.exe. 'Please run Start-PSBuild -Clean' first, and then try again." } diff --git a/docs/cmdlet-example/project.json b/docs/cmdlet-example/project.json index b54838c4108..396f9951fc0 100644 --- a/docs/cmdlet-example/project.json +++ b/docs/cmdlet-example/project.json @@ -11,8 +11,8 @@ "netstandard1.3": { "imports": [ "net40" ], "dependencies": { - "Microsoft.NETCore": "5.0.1", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1" + "Microsoft.NETCore": "5.0.3-preview1-001100-00", + "Microsoft.NETCore.Portable.Compatibility": "1.0.3-beta-24514-00" } } } diff --git a/nuget.config b/nuget.config index f05ee6fd873..4910d600bcd 100644 --- a/nuget.config +++ b/nuget.config @@ -7,6 +7,7 @@ + diff --git a/src/Microsoft.PackageManagement.ArchiverProviders/project.json b/src/Microsoft.PackageManagement.ArchiverProviders/project.json index ff003294c05..581da378097 100644 --- a/src/Microsoft.PackageManagement.ArchiverProviders/project.json +++ b/src/Microsoft.PackageManagement.ArchiverProviders/project.json @@ -1,52 +1,52 @@ { - "name": "Microsoft.PackageManagement.ArchiverProviders", - "version": "1.0.0-*", + "name": "Microsoft.PackageManagement.ArchiverProviders", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, + "buildOptions": { + "warningsAsErrors": true + }, - "configurations": { - "Linux": { - "buildOptions": { - "define": ["UNIX"] - } - } - }, + "configurations": { + "Linux": { + "buildOptions": { + "define": ["UNIX"] + } + } + }, - "dependencies": { - "System.Management.Automation": "1.0.0-*", - "Microsoft.PackageManagement": "1.0.0-*" - }, + "dependencies": { + "System.Management.Automation": "1.0.0-*", + "Microsoft.PackageManagement": "1.0.0-*" + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - } - }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + } + }, - "netstandard1.6": { - "imports": ["dnxcore50"], - "buildOptions": { - "define": ["CORECLR"], + "netstandard1.6": { + "imports": ["dnxcore50"], + "buildOptions": { + "define": ["CORECLR"], "debugType": "portable" - } - } - } + } + } + } } diff --git a/src/Microsoft.PackageManagement.CoreProviders/project.json b/src/Microsoft.PackageManagement.CoreProviders/project.json index 1c595b8fcaa..f890feb85f8 100644 --- a/src/Microsoft.PackageManagement.CoreProviders/project.json +++ b/src/Microsoft.PackageManagement.CoreProviders/project.json @@ -1,55 +1,55 @@ { - "name": "Microsoft.PackageManagement.CoreProviders", - "version": "1.0.0-*", + "name": "Microsoft.PackageManagement.CoreProviders", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, + "buildOptions": { + "warningsAsErrors": true + }, - "configurations": { - "Linux": { - "buildOptions": { - "define": ["UNIX"] - } - } - }, + "configurations": { + "Linux": { + "buildOptions": { + "define": ["UNIX"] + } + } + }, - "dependencies": { - "System.Management.Automation": "1.0.0-*", - "Microsoft.PackageManagement": "1.0.0-*" - }, + "dependencies": { + "System.Management.Automation": "1.0.0-*", + "Microsoft.PackageManagement": "1.0.0-*" + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - } - }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + } + }, - "netstandard1.6": { - "imports": ["dnxcore50"], - "buildOptions": { - "define": ["CORECLR", "PORTABLE"], + "netstandard1.6": { + "imports": ["dnxcore50"], + "buildOptions": { + "define": ["CORECLR", "PORTABLE"], "debugType": "portable", - "compile": { - "exclude": [ "ProgramsProvider.cs"] - } - } - } - } + "compile": { + "exclude": [ "ProgramsProvider.cs"] + } + } + } + } } diff --git a/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json b/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json index 6806044fc9e..8865a6482a1 100644 --- a/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json +++ b/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json @@ -1,52 +1,52 @@ { - "name": "Microsoft.PackageManagement.MetaProvider.PowerShell", - "version": "1.0.0-*", + "name": "Microsoft.PackageManagement.MetaProvider.PowerShell", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, + "buildOptions": { + "warningsAsErrors": true + }, - "configurations": { - "Linux": { - "buildOptions": { - "define": ["UNIX"] - } - } - }, + "configurations": { + "Linux": { + "buildOptions": { + "define": ["UNIX"] + } + } + }, - "dependencies": { - "System.Management.Automation": "1.0.0-*", - "Microsoft.PackageManagement": "1.0.0-*" - }, + "dependencies": { + "System.Management.Automation": "1.0.0-*", + "Microsoft.PackageManagement": "1.0.0-*" + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - } - }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + } + }, - "netstandard1.6": { - "imports": ["dnxcore50"], - "buildOptions": { - "define": ["CORECLR"], + "netstandard1.6": { + "imports": ["dnxcore50"], + "buildOptions": { + "define": ["CORECLR"], "debugType": "portable" - } - } - } + } + } + } } diff --git a/src/Microsoft.PackageManagement.NuGetProvider/project.json b/src/Microsoft.PackageManagement.NuGetProvider/project.json index 2bbea0238c1..bf06cd6e276 100644 --- a/src/Microsoft.PackageManagement.NuGetProvider/project.json +++ b/src/Microsoft.PackageManagement.NuGetProvider/project.json @@ -1,70 +1,70 @@ { - "name": "Microsoft.PackageManagement.NuGetProvider", - "version": "1.0.0-*", + "name": "Microsoft.PackageManagement.NuGetProvider", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, + "buildOptions": { + "warningsAsErrors": true + }, - "configurations": { - "Linux": { - "buildOptions": { - "define": ["UNIX"] - } - } - }, + "configurations": { + "Linux": { + "buildOptions": { + "define": ["UNIX"] + } + } + }, - "dependencies": { - "System.Management.Automation": "1.0.0-*" - }, + "dependencies": { + "System.Management.Automation": "1.0.0-*" + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - }, - "buildOptions": { - "compile": { - "include": [ - "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/Extensions.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" - ] - } - } - }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + }, + "buildOptions": { + "compile": { + "include": [ + "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/Extensions.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" + ] + } + } + }, - "netstandard1.6": { - "imports": ["dnxcore50"], - "buildOptions": { - "define": ["CORECLR"], - "debugType": "portable", - "compile": { - "include": [ - "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/Extensions.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" - ] - } - }, - "dependencies": { - "System.Linq.Parallel": "4.0.1" - } - } - } + "netstandard1.6": { + "imports": ["dnxcore50"], + "buildOptions": { + "define": ["CORECLR"], + "debugType": "portable", + "compile": { + "include": [ + "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/Extensions.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" + ] + } + }, + "dependencies": { + "System.Linq.Parallel": "4.3.0-preview1-24530-04" + } + } + } } diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json index 581cb2330e9..41a5da74442 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json @@ -1,71 +1,71 @@ { - "name": "Microsoft.PackageManagement.PackageSourceListProvider", - "version": "1.0.0-*", + "name": "Microsoft.PackageManagement.PackageSourceListProvider", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, + "buildOptions": { + "warningsAsErrors": true + }, - "configurations": { - "Linux": { - "buildOptions": { - "define": [ "UNIX" ] - } - } - }, + "configurations": { + "Linux": { + "buildOptions": { + "define": [ "UNIX" ] + } + } + }, - "dependencies": { - "System.Management.Automation": "1.0.0-*", - "Microsoft.PackageManagement": "1.0.0-*" - }, + "dependencies": { + "System.Management.Automation": "1.0.0-*", + "Microsoft.PackageManagement": "1.0.0-*" + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - }, - "buildOptions": { - "compile": { - "include": [ - "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" - ] - } - } - }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + }, + "buildOptions": { + "compile": { + "include": [ + "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" + ] + } + } + }, - "netstandard1.6": { - "imports": ["dnxcore50"], - "buildOptions": { - "define": ["CORECLR"], - "debugType": "portable", - "compile": { - "include": [ - "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", - "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" - ] - } - }, - "dependencies": { - "System.Linq.Parallel": "4.0.1" - } - } - } + "netstandard1.6": { + "imports": ["dnxcore50"], + "buildOptions": { + "define": ["CORECLR"], + "debugType": "portable", + "compile": { + "include": [ + "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Utility/*.cs", + "../Microsoft.PackageManagement/Providers/Inbox/Common/Version/*.cs" + ] + } + }, + "dependencies": { + "System.Linq.Parallel": "4.3.0-preview1-24530-04" + } + } + } } diff --git a/src/Microsoft.PackageManagement/project.json b/src/Microsoft.PackageManagement/project.json index 3fbd7d7d18e..e39abbddd31 100644 --- a/src/Microsoft.PackageManagement/project.json +++ b/src/Microsoft.PackageManagement/project.json @@ -1,59 +1,59 @@ { - "name": "Microsoft.PackageManagement", - "version": "1.0.0-*", + "name": "Microsoft.PackageManagement", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, - - "configurations": { - "Linux": { - "buildOptions": { - "define": [ "UNIX" ] - } - } - }, - - "dependencies": { - "System.Management.Automation": "1.0.0-*" - }, + "buildOptions": { + "warningsAsErrors": true + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - }, - "buildOptions": { - "compile": { - "exclude": [ "Providers/Inbox/Common/*" ] + "configurations": { + "Linux": { + "buildOptions": { + "define": [ "UNIX" ] + } } - } }, - "netstandard1.6": { - "imports": [ "dnxcore50" ], - "buildOptions": { - "define": [ "CORECLR", "PORTABLE" ], - "debugType": "portable", - "compile": { - "exclude": [ "Providers/Inbox/Common/*" ] - } - } + "dependencies": { + "System.Management.Automation": "1.0.0-*" + }, + + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + }, + "buildOptions": { + "compile": { + "exclude": [ "Providers/Inbox/Common/*" ] + } + } + }, + + "netstandard1.6": { + "imports": [ "dnxcore50" ], + "buildOptions": { + "define": [ "CORECLR", "PORTABLE" ], + "debugType": "portable", + "compile": { + "exclude": [ "Providers/Inbox/Common/*" ] + } + } + } } - } } diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 0edc7bd5b0e..8f44c2fcae2 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -78,9 +78,9 @@ } }, "dependencies": { - "System.ServiceProcess.ServiceController": "4.1.0", - "System.Net.NameResolution": "4.0.0", - "System.Net.Ping": "4.0.0" + "System.ServiceProcess.ServiceController": "4.3.0-preview1-24530-04", + "System.Net.NameResolution": "4.3.0-preview1-24530-04", + "System.Net.Ping": "4.3.0-preview1-24530-04" } }, "net451": { diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index c9c9cb9e273..a1443bd9a0a 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -85,9 +85,8 @@ }, "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.1.1", - "Newtonsoft.Json": "9.0.1", - "System.Diagnostics.TextWriterTraceListener": "4.0.0" + "Microsoft.CodeAnalysis.CSharp": "1.3.1-beta1-20160616-03", + "System.Diagnostics.TextWriterTraceListener": "4.3.0-preview1-24530-04" } }, "net451": { @@ -95,7 +94,7 @@ "System.Drawing": "", "System.Web": "", "System.Web.Extensions": "", - "Microsoft.JScript": "", + "Microsoft.JScript": "" }, "dependencies": { diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index 7942b247c05..acdb78f27bd 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -46,9 +46,8 @@ } }, "dependencies": { - "Newtonsoft.Json": "9.0.1", - "System.Xml.XDocument": "4.0.11", - "System.IO.MemoryMappedFiles": "4.0.0" + "System.Xml.XDocument": "4.3.0-preview1-24530-04", + "System.IO.MemoryMappedFiles": "4.3.0-preview1-24530-04" } }, "net451": { diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs index dd8718b4d02..aad53d2d6e0 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs @@ -121,7 +121,7 @@ private PowerShellAssemblyLoadContext(string basePaths, bool useResolvingHandler else { var tempSet = new HashSet(_coreClrTypeCatalog.Values, StringComparer.OrdinalIgnoreCase); - _tpaSet = new HashSet(StringComparer.OrdinalIgnoreCase); + _tpaSet = new HashSet(StringComparer.OrdinalIgnoreCase) { "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext" }; foreach (string tpa in tempSet) { string shortName = tpa.Substring(0, tpa.IndexOf(',')); @@ -812,4 +812,5 @@ public static object InitializeAndCallEntryMethod(string basePaths, AssemblyName } } -#endif \ No newline at end of file +#endif + diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 961d1e0047e..241dc9d97d3 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -26,11 +26,11 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Runtime.Loader": "4.0.0", - "System.Reflection.Metadata": "1.1.0", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Security.Cryptography.Algorithms": "4.2.0" + "NETStandard.Library": "1.6.1-preview1-24530-04", + "System.Runtime.Loader": "4.3.0-preview1-24530-04", + "System.Reflection.Metadata": "1.4.1-preview1-24530-04", + "System.Reflection.TypeExtensions": "4.3.0-preview1-24530-04", + "System.Security.Cryptography.Algorithms": "4.3.0-preview1-24530-04" } } } diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json index 7cdd49a42cb..47da01055e1 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -20,11 +20,11 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Security.Principal": "4.0.1", - "System.Security.Principal.Windows": "4.0.0", - "System.Diagnostics.TraceSource": "4.0.0", - "System.Security.SecureString": "4.0.0" + "NETStandard.Library": "1.6.1-preview1-24530-04", + "System.Security.Principal": "4.3.0-preview1-24530-04", + "System.Security.Principal.Windows": "4.3.0-preview1-24530-04", + "System.Diagnostics.TraceSource": "4.3.0-preview1-24530-04", + "System.Security.SecureString": "4.3.0-preview1-24530-04" } } } diff --git a/src/Microsoft.PowerShell.LocalAccounts/project.json b/src/Microsoft.PowerShell.LocalAccounts/project.json index 656c6ff372f..620a96c8d06 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/project.json +++ b/src/Microsoft.PowerShell.LocalAccounts/project.json @@ -22,7 +22,7 @@ "debugType": "portable" }, "dependencies": { - "System.Net.NameResolution": "4.0.0" + "System.Net.NameResolution": "4.3.0-preview1-24530-04" } }, "net451": { diff --git a/src/Microsoft.PowerShell.PackageManagement/project.json b/src/Microsoft.PowerShell.PackageManagement/project.json index 7cf2bd2e9a4..85545a487f7 100644 --- a/src/Microsoft.PowerShell.PackageManagement/project.json +++ b/src/Microsoft.PowerShell.PackageManagement/project.json @@ -1,60 +1,60 @@ { - "name": "Microsoft.PowerShell.PackageManagement", - "version": "1.0.0-*", + "name": "Microsoft.PowerShell.PackageManagement", + "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true - }, - - "configurations": { - "Linux": { - "buildOptions": { - "define": ["UNIX"] - } - } - }, + "buildOptions": { + "warningsAsErrors": true + }, - "dependencies": { - "System.Management.Automation": "1.0.0-*", - "Microsoft.PackageManagement": "1.0.0-*", - "Microsoft.PackageManagement.NuGetProvider": "1.0.0-*", - "Microsoft.PackageManagement.CoreProviders": "1.0.0-*", - "Microsoft.PackageManagement.MetaProvider.PowerShell": "1.0.0-*", - "Microsoft.PackageManagement.ArchiverProviders": "1.0.0-*" - }, + "configurations": { + "Linux": { + "buildOptions": { + "define": ["UNIX"] + } + } + }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Numerics": "", - "System.Data": "", - "System.DirectoryServices": "", - "System.Security": "", - "System.Transactions": "", - "System.Runtime.Serialization": "", - "System.Management": "", - "System.Configuration": "", - "System.Configuration.Install": "", - "System.Net": "", - "System.Net.Http": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "" - }, - "dependencies": { - "Microsoft.PackageManagement.MsiProvider": "1.0.0-*", - "Microsoft.PackageManagement.MsuProvider": "1.0.0-*" - } + "dependencies": { + "System.Management.Automation": "1.0.0-*", + "Microsoft.PackageManagement": "1.0.0-*", + "Microsoft.PackageManagement.NuGetProvider": "1.0.0-*", + "Microsoft.PackageManagement.CoreProviders": "1.0.0-*", + "Microsoft.PackageManagement.MetaProvider.PowerShell": "1.0.0-*", + "Microsoft.PackageManagement.ArchiverProviders": "1.0.0-*" }, - "netstandard1.6": { - "imports": [ "dnxcore50" ], - "buildOptions": { - "define": ["CORECLR"], - "debugType": "portable" - } - } - } + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "", + "System.Xml.Linq": "", + "System.Numerics": "", + "System.Data": "", + "System.DirectoryServices": "", + "System.Security": "", + "System.Transactions": "", + "System.Runtime.Serialization": "", + "System.Management": "", + "System.Configuration": "", + "System.Configuration.Install": "", + "System.Net": "", + "System.Net.Http": "", + "System.IO.Compression": "", + "System.IO.Compression.FileSystem": "" + }, + "dependencies": { + "Microsoft.PackageManagement.MsiProvider": "1.0.0-*", + "Microsoft.PackageManagement.MsuProvider": "1.0.0-*" + } + }, + + "netstandard1.6": { + "imports": [ "dnxcore50" ], + "buildOptions": { + "define": ["CORECLR"], + "debugType": "portable" + } + } + } } diff --git a/src/Microsoft.PowerShell.SDK/project.json b/src/Microsoft.PowerShell.SDK/project.json index c3d10c45396..5901428a559 100644 --- a/src/Microsoft.PowerShell.SDK/project.json +++ b/src/Microsoft.PowerShell.SDK/project.json @@ -16,89 +16,89 @@ "netstandard1.6": { "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.CSharp": "4.0.1", - "Microsoft.VisualBasic": "10.0.1", - "Microsoft.Win32.Registry" : "4.0.0", - "Microsoft.Win32.Registry.AccessControl" : "4.0.0", - "NETStandard.Library": "1.6", - "System.Collections.Immutable" : "1.2.0", - "System.Collections.NonGeneric" : "4.0.1", - "System.Collections.Specialized" : "4.0.1", - "System.ComponentModel" : "4.0.1", - "System.ComponentModel.Annotations" : "4.1.0", - "System.ComponentModel.EventBasedAsync" : "4.0.11", - "System.ComponentModel.Primitives" : "4.1.0", - "System.ComponentModel.TypeConverter" : "4.1.0", - "System.Data.Common" : "4.1.0", - "System.Data.SqlClient" : "4.1.0", - "System.Diagnostics.Contracts" : "4.0.1", - "System.Diagnostics.DiagnosticSource" : "4.0.0", - "System.Diagnostics.FileVersionInfo" : "4.0.0", - "System.Diagnostics.Process" : "4.1.0", - "System.Diagnostics.StackTrace" : "4.0.1", - "System.Diagnostics.TextWriterTraceListener" : "4.0.0", - "System.Diagnostics.TraceSource" : "4.0.0", - "System.Dynamic.Runtime" : "4.0.11", - "System.Globalization.Extensions" : "4.0.1", - "System.IO.FileSystem.AccessControl" : "4.0.0", - "System.IO.FileSystem.DriveInfo" : "4.0.0", - "System.IO.FileSystem.Watcher" : "4.0.0", - "System.IO.MemoryMappedFiles" : "4.0.0", - "System.IO.Packaging" : "4.0.0", - "System.IO.Pipes" : "4.0.0", - "System.IO.UnmanagedMemoryStream" : "4.0.1", - "System.Linq.Parallel" : "4.0.1", - "System.Linq.Queryable" : "4.0.1", - "System.Net.Http.WinHttpHandler" : "4.0.0", - "System.Net.NameResolution" : "4.0.0", - "System.Net.NetworkInformation" : "4.1.0", - "System.Net.Ping" : "4.0.0", - "System.Net.Requests" : "4.0.11", - "System.Net.Security" : "4.0.0", - "System.Net.WebHeaderCollection" : "4.0.1", - "System.Net.WebSockets" : "4.0.0", - "System.Net.WebSockets.Client" : "4.0.0", - "System.Numerics.Vectors" : "4.1.1", - "System.Reflection.DispatchProxy" : "4.0.1", - "System.Reflection.Emit" : "4.0.1", - "System.Reflection.Emit.ILGeneration" : "4.0.1", - "System.Reflection.Emit.Lightweight" : "4.0.1", - "System.Reflection.Metadata" : "1.3.0", - "System.Reflection.TypeExtensions" : "4.1.0", - "System.Resources.Reader" : "4.0.0", - "System.Runtime.CompilerServices.VisualC" : "4.0.0", - "System.Runtime.Serialization.Json" : "4.0.2", - "System.Runtime.Serialization.Primitives" : "4.1.1", - "System.Runtime.Serialization.Xml" : "4.1.1", - "System.Security.AccessControl" : "4.0.0", - "System.Security.Claims" : "4.0.1", - "System.Security.Cryptography.Cng" : "4.2.0", - "System.Security.Cryptography.Csp" : "4.0.0", - "System.Security.Cryptography.Pkcs" : "4.0.0", - "System.Security.Principal" : "4.0.1", - "System.Security.Principal.Windows" : "4.0.0", - "System.Security.SecureString" : "4.0.0", - "System.ServiceModel.Duplex" : "4.0.1", - "System.ServiceModel.Http" : "4.1.0", - "System.ServiceModel.NetTcp" : "4.1.0", - "System.ServiceModel.Primitives" : "4.1.0", - "System.ServiceModel.Security" : "4.0.1", - "System.ServiceProcess.ServiceController" : "4.1.0", - "System.Text.Encoding.CodePages" : "4.0.1", - "System.Text.Encodings.Web" : "4.0.0", - "System.Threading.AccessControl" : "4.0.0", - "System.Threading.Overlapped" : "4.0.1", - "System.Threading.Tasks.Dataflow" : "4.6.0", - "System.Threading.Tasks.Parallel" : "4.0.1", - "System.Threading.Thread" : "4.0.0", - "System.Threading.ThreadPool" : "4.0.10", - "System.Xml.XmlDocument" : "4.0.1", - "System.Xml.XmlSerializer" : "4.0.11", - "System.Xml.XPath" : "4.0.1", - "System.Xml.XPath.XDocument" : "4.0.1", - "System.Xml.XPath.XmlDocument" : "4.0.1", - "System.Private.ServiceModel": "4.1.0" + "Microsoft.NETCore.Portable.Compatibility": "1.0.3-beta-24514-00", + "Microsoft.CSharp": "4.3.0-preview1-24530-04", + "Microsoft.VisualBasic": "10.1.0-preview1-24530-04", + "Microsoft.Win32.Registry" : "4.3.0-preview1-24530-04", + "Microsoft.Win32.Registry.AccessControl" : "4.3.0-preview1-24530-04", + "NETStandard.Library": "1.6.1-preview1-24530-04", + "System.Collections.Immutable" : "1.3.0-preview1-24530-04", + "System.Collections.NonGeneric" : "4.3.0-preview1-24530-04", + "System.Collections.Specialized" : "4.3.0-preview1-24530-04", + "System.ComponentModel" : "4.3.0-preview1-24530-04", + "System.ComponentModel.Annotations" : "4.3.0-preview1-24530-04", + "System.ComponentModel.EventBasedAsync" : "4.3.0-preview1-24530-04", + "System.ComponentModel.Primitives" : "4.3.0-preview1-24530-04", + "System.ComponentModel.TypeConverter" : "4.3.0-preview1-24530-04", + "System.Data.Common" : "4.3.0-preview1-24530-04", + "System.Data.SqlClient" : "4.3.0-preview1-24530-04", + "System.Diagnostics.Contracts" : "4.3.0-preview1-24530-04", + "System.Diagnostics.DiagnosticSource" : "4.3.0-preview1-24530-04", + "System.Diagnostics.FileVersionInfo" : "4.3.0-preview1-24530-04", + "System.Diagnostics.Process" : "4.3.0-preview1-24530-04", + "System.Diagnostics.StackTrace" : "4.3.0-preview1-24530-04", + "System.Diagnostics.TextWriterTraceListener" : "4.3.0-preview1-24530-04", + "System.Diagnostics.TraceSource" : "4.3.0-preview1-24530-04", + "System.Dynamic.Runtime" : "4.3.0-preview1-24530-04", + "System.Globalization.Extensions" : "4.3.0-preview1-24530-04", + "System.IO.FileSystem.AccessControl" : "4.3.0-preview1-24530-04", + "System.IO.FileSystem.DriveInfo" : "4.3.0-preview1-24530-04", + "System.IO.FileSystem.Watcher" : "4.3.0-preview1-24530-04", + "System.IO.MemoryMappedFiles" : "4.3.0-preview1-24530-04", + "System.IO.Packaging" : "4.3.0-preview1-24530-04", + "System.IO.Pipes" : "4.3.0-preview1-24530-04", + "System.IO.UnmanagedMemoryStream" : "4.3.0-preview1-24530-04", + "System.Linq.Parallel" : "4.3.0-preview1-24530-04", + "System.Linq.Queryable" : "4.3.0-preview1-24530-04", + "System.Net.Http.WinHttpHandler" : "4.3.0-preview1-24530-04", + "System.Net.NameResolution" : "4.3.0-preview1-24530-04", + "System.Net.NetworkInformation" : "4.3.0-preview1-24530-04", + "System.Net.Ping" : "4.3.0-preview1-24530-04", + "System.Net.Requests" : "4.3.0-preview1-24530-04", + "System.Net.Security" : "4.3.0-preview1-24530-04", + "System.Net.WebHeaderCollection" : "4.3.0-preview1-24530-04", + "System.Net.WebSockets" : "4.3.0-preview1-24530-04", + "System.Net.WebSockets.Client" : "4.3.0-preview1-24530-04", + "System.Numerics.Vectors" : "4.3.0-preview1-24530-04", + "System.Reflection.DispatchProxy" : "4.3.0-preview1-24530-04", + "System.Reflection.Emit" : "4.3.0-preview1-24530-04", + "System.Reflection.Emit.ILGeneration" : "4.3.0-preview1-24530-04", + "System.Reflection.Emit.Lightweight" : "4.3.0-preview1-24530-04", + "System.Reflection.Metadata" : "1.4.1-preview1-24530-04", + "System.Reflection.TypeExtensions" : "4.3.0-preview1-24530-04", + "System.Resources.Reader" : "4.3.0-preview1-24530-04", + "System.Runtime.CompilerServices.VisualC" : "4.3.0-preview1-24530-04", + "System.Runtime.Serialization.Json" : "4.3.0-preview1-24530-04", + "System.Runtime.Serialization.Primitives" : "4.3.0-preview1-24530-04", + "System.Runtime.Serialization.Xml" : "4.3.0-preview1-24530-04", + "System.Security.AccessControl" : "4.3.0-preview1-24530-04", + "System.Security.Claims" : "4.3.0-preview1-24530-04", + "System.Security.Cryptography.Cng" : "4.3.0-preview1-24530-04", + "System.Security.Cryptography.Csp" : "4.3.0-preview1-24530-04", + "System.Security.Cryptography.Pkcs" : "4.3.0-preview1-24530-04", + "System.Security.Principal" : "4.3.0-preview1-24530-04", + "System.Security.Principal.Windows" : "4.3.0-preview1-24530-04", + "System.Security.SecureString" : "4.3.0-preview1-24530-04", + "System.ServiceModel.Duplex" : "4.3.0-preview1-24611-01", + "System.ServiceModel.Http" : "4.3.0-preview1-24611-01", + "System.ServiceModel.NetTcp" : "4.3.0-preview1-24611-01", + "System.ServiceModel.Primitives" : "4.3.0-preview1-24611-01", + "System.ServiceModel.Security" : "4.3.0-preview1-24611-01", + "System.ServiceProcess.ServiceController" : "4.3.0-preview1-24530-04", + "System.Text.Encoding.CodePages" : "4.3.0-preview1-24530-04", + "System.Text.Encodings.Web" : "4.3.0-preview1-24530-04", + "System.Threading.AccessControl" : "4.3.0-preview1-24530-04", + "System.Threading.Overlapped" : "4.3.0-preview1-24530-04", + "System.Threading.Tasks.Dataflow" : "4.7.0-preview1-24530-04", + "System.Threading.Tasks.Parallel" : "4.3.0-preview1-24530-04", + "System.Threading.Thread" : "4.3.0-preview1-24530-04", + "System.Threading.ThreadPool" : "4.3.0-preview1-24530-04", + "System.Xml.XmlDocument" : "4.3.0-preview1-24530-04", + "System.Xml.XmlSerializer" : "4.3.0-preview1-24530-04", + "System.Xml.XPath" : "4.3.0-preview1-24530-04", + "System.Xml.XPath.XDocument" : "4.3.0-preview1-24530-04", + "System.Xml.XPath.XmlDocument" : "4.3.0-preview1-24530-04", + "System.Private.ServiceModel": "4.3.0-preview1-24611-01" } } } diff --git a/src/Microsoft.WSMan.Management/project.json b/src/Microsoft.WSMan.Management/project.json index b888ffbf74a..45f5ea0197a 100644 --- a/src/Microsoft.WSMan.Management/project.json +++ b/src/Microsoft.WSMan.Management/project.json @@ -25,9 +25,6 @@ "WsManSnapin.cs" ] } - }, - "dependencies": { - "NETStandard.Library": "1.6.0", } }, "net451": { diff --git a/src/Microsoft.WSMan.Runtime/project.json b/src/Microsoft.WSMan.Runtime/project.json index 23a067c9212..6330602e36f 100644 --- a/src/Microsoft.WSMan.Runtime/project.json +++ b/src/Microsoft.WSMan.Runtime/project.json @@ -17,7 +17,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0", + "NETStandard.Library": "1.6.1-preview1-24530-04" } }, "net451": { diff --git a/src/ResGen/project.json b/src/ResGen/project.json index 40cd1ab2e36..effac58925b 100644 --- a/src/ResGen/project.json +++ b/src/ResGen/project.json @@ -10,8 +10,8 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0", - "System.Xml.XDocument": "4.0.11" + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00", + "System.Xml.XDocument": "4.3.0-preview1-24530-04" } } }, diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 796bf2d6d9d..269bb1afeb6 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -143,37 +143,37 @@ "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*", "Microsoft.PowerShell.CoreCLR.Eventing": "1.0.0-*", - "Microsoft.CSharp": "4.0.1", - "Microsoft.Win32.Registry.AccessControl": "4.0.0", + "Microsoft.CSharp": "4.3.0-preview1-24530-04", + "Microsoft.Win32.Registry.AccessControl": "4.3.0-preview1-24530-04", "Newtonsoft.Json": "9.0.1", - "System.Collections.Specialized": "4.0.1", - "System.Collections.NonGeneric": "4.0.1", - "System.ComponentModel.EventBasedAsync": "4.0.11", - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Data.Common": "4.1.0", - "System.Diagnostics.Contracts": "4.0.1", - "System.Diagnostics.FileVersionInfo": "4.0.0", - "System.Diagnostics.Process": "4.1.0", - "System.Diagnostics.StackTrace": "4.0.1", - "System.Diagnostics.TraceSource": "4.0.0", - "System.Dynamic.Runtime": "4.0.11", - "System.IO.FileSystem.AccessControl": "4.0.0", - "System.IO.FileSystem.DriveInfo": "4.0.0", - "System.IO.FileSystem.Watcher": "4.0.0", - "System.IO.Pipes": "4.0.0", - "System.Linq.Expressions": "4.1.0", - "System.Net.Http": "4.1.0", - "System.Net.NetworkInformation": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Security.AccessControl": "4.0.0", - "System.Security.Cryptography.Algorithms": "4.2.0", - "System.Security.Cryptography.X509Certificates": "4.1.0", - "System.Threading.Thread": "4.0.0", - "System.Threading.Tasks.Parallel": "4.0.1", - "System.Xml.XPath.XmlDocument": "4.0.1", - "System.Xml.XmlDocument": "4.0.1", - "System.Xml.XmlSerializer": "4.0.11" + "System.Collections.Specialized": "4.3.0-preview1-24530-04", + "System.Collections.NonGeneric": "4.3.0-preview1-24530-04", + "System.ComponentModel.EventBasedAsync": "4.3.0-preview1-24530-04", + "System.ComponentModel.TypeConverter": "4.3.0-preview1-24530-04", + "System.Data.Common": "4.3.0-preview1-24530-04", + "System.Diagnostics.Contracts": "4.3.0-preview1-24530-04", + "System.Diagnostics.FileVersionInfo": "4.3.0-preview1-24530-04", + "System.Diagnostics.Process": "4.3.0-preview1-24530-04", + "System.Diagnostics.StackTrace": "4.3.0-preview1-24530-04", + "System.Diagnostics.TraceSource": "4.3.0-preview1-24530-04", + "System.Dynamic.Runtime": "4.3.0-preview1-24530-04", + "System.IO.FileSystem.AccessControl": "4.3.0-preview1-24530-04", + "System.IO.FileSystem.DriveInfo": "4.3.0-preview1-24530-04", + "System.IO.FileSystem.Watcher": "4.3.0-preview1-24530-04", + "System.IO.Pipes": "4.3.0-preview1-24530-04", + "System.Linq.Expressions": "4.3.0-preview1-24530-04", + "System.Net.Http": "4.3.0-preview1-24530-04", + "System.Net.NetworkInformation": "4.3.0-preview1-24530-04", + "System.Reflection.Emit": "4.3.0-preview1-24530-04", + "System.Reflection.Emit.Lightweight": "4.3.0-preview1-24530-04", + "System.Security.AccessControl": "4.3.0-preview1-24530-04", + "System.Security.Cryptography.Algorithms": "4.3.0-preview1-24530-04", + "System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04", + "System.Threading.Thread": "4.3.0-preview1-24530-04", + "System.Threading.Tasks.Parallel": "4.3.0-preview1-24530-04", + "System.Xml.XPath.XmlDocument": "4.3.0-preview1-24530-04", + "System.Xml.XmlDocument": "4.3.0-preview1-24530-04", + "System.Xml.XmlSerializer": "4.3.0-preview1-24530-04" } }, "net451": { diff --git a/src/TypeCatalogGen/project.json b/src/TypeCatalogGen/project.json index b86875d9a57..5fbe31aed24 100644 --- a/src/TypeCatalogGen/project.json +++ b/src/TypeCatalogGen/project.json @@ -11,9 +11,9 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0", - "System.Reflection.Metadata": "1.3.0", - "System.Collections.Immutable": "1.2.0" + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00", + "System.Reflection.Metadata": "1.4.1-preview1-24530-04", + "System.Collections.Immutable": "1.3.0-preview1-24530-04" } } }, diff --git a/src/TypeCatalogParser/project.json b/src/TypeCatalogParser/project.json index d6dd1377c25..0e723f67921 100644 --- a/src/TypeCatalogParser/project.json +++ b/src/TypeCatalogParser/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00", "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121", "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-003121" }, diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json index 6dd3c889d58..22d31aa87d9 100644 --- a/src/powershell-unix/project.json +++ b/src/powershell-unix/project.json @@ -69,8 +69,7 @@ "debugType": "portable" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" } } }, diff --git a/src/powershell-win-core/project.json b/src/powershell-win-core/project.json index a46fd06025b..f255b4b3b39 100644 --- a/src/powershell-win-core/project.json +++ b/src/powershell-win-core/project.json @@ -73,8 +73,7 @@ "debugType": "portable" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" } } }, @@ -82,6 +81,6 @@ "runtimes": { "win7-x64": { }, "win81-x64": { }, - "win10-x64": { }, + "win10-x64": { } } } diff --git a/test/PSReadLine/project.json b/test/PSReadLine/project.json index 621854b77cb..45fcf9dd821 100644 --- a/test/PSReadLine/project.json +++ b/test/PSReadLine/project.json @@ -16,7 +16,7 @@ "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" } } }, diff --git a/test/csharp/project.json b/test/csharp/project.json index a1510c6bd79..ce5c7d588da 100644 --- a/test/csharp/project.json +++ b/test/csharp/project.json @@ -17,8 +17,8 @@ "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-build10025" + "xunit": "2.2.0-beta3-build3402", + "dotnet-test-xunit": "2.2.0-preview2-build1029" } } }, diff --git a/test/tools/EchoArgs/project.json b/test/tools/EchoArgs/project.json index 106dcc46a71..11fcc6b2ca8 100644 --- a/test/tools/EchoArgs/project.json +++ b/test/tools/EchoArgs/project.json @@ -10,7 +10,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" } } }, From d155f7ee80e3132173ce461272df7111d149970b Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 12 Oct 2016 10:44:37 -0700 Subject: [PATCH 2/6] Update build.psm1 to not remove IL assemblies after crossgen because the latest dotnet.exe checks the existence of all TPA assemblies, including those built from the local projects --- build.psm1 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.psm1 b/build.psm1 index 034b1cb4eb9..280b422060a 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2437,6 +2437,12 @@ function Start-CrossGen { Generate-CrossGenAssembly -CrossgenPath $crossGenPath -AssemblyPath $assemblyPath } + <# + # The latest dotnet.exe from .NET Core 1.1.0 preview packages starts + # to check the existence of all TPA assemblies, including those built + # from local projects (e.g. powershell assemblies). The TPA assemblies + # in '.deps.json' are IL assemblies, so we cannot remove those ILs. + # Write-Verbose "PowerShell Ngen assemblies have been generated, deleting ILs..." -Verbose foreach ($assemblyName in $psCoreAssemblyList) { # Remove the IL assembly and its symbols. @@ -2445,6 +2451,7 @@ function Start-CrossGen { Remove-Item $assemblyPath -Force -ErrorAction SilentlyContinue Remove-Item $symbolsPath -Force -ErrorAction SilentlyContinue } + #> } # Cleans the PowerShell repo From b540879036d5807b24b32367ea58a342c6b31e14 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 12 Oct 2016 16:55:41 -0700 Subject: [PATCH 3/6] Avoid calling static members from 'Microsoft.Win32.Registry' on UNIX, especially the code that would run in TypeInitializer. This is because with the latest .NET Core packages (1.1.0 preview), calling static members from 'Microsoft.Win32.Registry' will raise 'PlatformNotSupportedException'. --- .../engine/Utils.cs | 16 ++++- .../engine/hostifaces/LocalPipeline.cs | 67 +++++++++---------- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs index 70d3ac4a94b..7d71e2a132e 100644 --- a/src/System.Management.Automation/engine/Utils.cs +++ b/src/System.Management.Automation/engine/Utils.cs @@ -200,8 +200,12 @@ internal static TypeTable GetTypeTableFromExecutionContextTLS() return ecFromTLS.TypeTable; } +#if !UNIX private static string s_pshome = null; + /// + /// Get the application base path of the shell from registry + /// internal static string GetApplicationBaseFromRegistry(string shellId) { bool wantPsHome = (object)shellId == (object)DefaultPowerShellShellID; @@ -226,6 +230,7 @@ internal static string GetApplicationBaseFromRegistry(string shellId) return null; } +#endif /// /// Gets the application base for current monad version @@ -616,13 +621,18 @@ internal static string GetRegistryConfigurationPath(string shellID) return GetRegistryConfigurationPrefix() + "\\" + shellID; } - // Retrieves group policy settings based on the preference order provided: - // Dictionary settings = GetGroupPolicySetting("Transcription", Registry.LocalMachine, Registry.CurrentUser); - + // Calling static members of 'Registry' on UNIX will raise 'PlatformNotSupportedException' +#if UNIX + internal static RegistryKey[] RegLocalMachine = null; + internal static RegistryKey[] RegCurrentUser = null; + internal static RegistryKey[] RegLocalMachineThenCurrentUser = null; + internal static RegistryKey[] RegCurrentUserThenLocalMachine = null; +#else internal static RegistryKey[] RegLocalMachine = new[] { Registry.LocalMachine }; internal static RegistryKey[] RegCurrentUser = new[] { Registry.CurrentUser }; internal static RegistryKey[] RegLocalMachineThenCurrentUser = new[] { Registry.LocalMachine, Registry.CurrentUser }; internal static RegistryKey[] RegCurrentUserThenLocalMachine = new[] { Registry.CurrentUser, Registry.LocalMachine }; +#endif internal static Dictionary GetGroupPolicySetting(string settingName, RegistryKey[] preferenceOrder) { diff --git a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs index 64719a124aa..bba09c267a1 100644 --- a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs +++ b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs @@ -247,6 +247,7 @@ private void SetupInvokeThread(Thread invokeThread, bool changeName) } } +#if !CORECLR /// /// Stack Reserve setting for pipeline threads /// @@ -263,6 +264,38 @@ internal static int MaxStack } } + internal static int ReadRegistryInt(string policyValueName, int defaultValue) + { + RegistryKey key; + try + { + key = Registry.LocalMachine.OpenSubKey(Utils.GetRegistryConfigurationPrefix()); + } + catch (System.Security.SecurityException) + { + return defaultValue; + } + if (null == key) + return defaultValue; + + object temp; + try + { + temp = key.GetValue(policyValueName); + } + catch (System.Security.SecurityException) + { + return defaultValue; + } + if (!(temp is int)) + { + return defaultValue; + } + int i = (int)temp; + return i; + } +#endif + /// /// Helper method for asynchronous invoke ///Unhandled FlowControl exception if InvocationSettings.ExposeFlowControlExceptions is true. @@ -531,40 +564,6 @@ private FlowControlException InvokeHelper() return flowControlException; } - // NTRAID#Windows Out Of Band Releases-915506-2005/09/09 - // Removed HandleUnexpectedExceptions infrastructure - - internal static int ReadRegistryInt(string policyValueName, int defaultValue) - { - RegistryKey key; - try - { - key = Registry.LocalMachine.OpenSubKey(Utils.GetRegistryConfigurationPrefix()); - } - catch (System.Security.SecurityException) - { - return defaultValue; - } - if (null == key) - return defaultValue; - - object temp; - try - { - temp = key.GetValue(policyValueName); - } - catch (System.Security.SecurityException) - { - return defaultValue; - } - if (!(temp is int)) - { - return defaultValue; - } - int i = (int)temp; - return i; - } - // NTRAID#Windows Out Of Band Releases-915506-2005/09/09 // Removed HandleUnexpectedExceptions infrastructure /// From ea40c8b5eb63598de608366b74723113946d1a52 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 13 Oct 2016 00:11:11 -0700 Subject: [PATCH 4/6] Exclude 'Registry' and 'Certificate' providers from UNIX PS since they don't work on UNIX platform. With this change, 'Registry' and 'Certificate' providers won't be compiled for UNIX PS. --- .../security/AclCommands.cs | 3 +++ .../security/CertificateProvider.cs | 2 ++ .../security/certificateproviderexceptions.cs | 6 ++---- .../engine/InitialSessionState.cs | 2 ++ .../engine/SessionStateDriveAPIs.cs | 9 +++++++++ .../namespaces/RegistryProvider.cs | 6 ++---- .../namespaces/RegistrySecurity.cs | 4 ++-- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.PowerShell.Security/security/AclCommands.cs b/src/Microsoft.PowerShell.Security/security/AclCommands.cs index 0ce913cb9b0..a54aff50c91 100644 --- a/src/Microsoft.PowerShell.Security/security/AclCommands.cs +++ b/src/Microsoft.PowerShell.Security/security/AclCommands.cs @@ -614,6 +614,7 @@ public static string GetSddl(PSObject instance) private string[] _exclude = new string[0]; } +#if !UNIX /// /// Defines the implementation of the 'get-acl' cmdlet. /// This cmdlet gets the security descriptor of an item at the specified path. @@ -1582,6 +1583,8 @@ protected override void ProcessRecord() } } } // class SetAclCommand +#endif // !UNIX + }// namespace Microsoft.PowerShell.Commands #pragma warning restore 56506 diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs index 68a5913560c..e8d299d3f64 100644 --- a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs +++ b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs @@ -1,3 +1,4 @@ +#if !UNIX /********************************************************************++ Copyright (c) Microsoft Corporation. All rights reserved. --********************************************************************/ @@ -3906,3 +3907,4 @@ internal static bool CertEnumSystemStoreCallBack(string storeName, } } } +#endif // !UNIX diff --git a/src/Microsoft.PowerShell.Security/security/certificateproviderexceptions.cs b/src/Microsoft.PowerShell.Security/security/certificateproviderexceptions.cs index 523ba9fb038..fe422134781 100644 --- a/src/Microsoft.PowerShell.Security/security/certificateproviderexceptions.cs +++ b/src/Microsoft.PowerShell.Security/security/certificateproviderexceptions.cs @@ -1,12 +1,10 @@ +#if !UNIX /********************************************************************++ Copyright (c) Microsoft Corporation. All rights reserved. --********************************************************************/ - using System; -using Dbg = System.Management.Automation; using System.Runtime.Serialization; -using System.Reflection; #if CORECLR // Use stub for SerializableAttribute, SystemException, ThreadAbortException and ISerializable related types. @@ -312,4 +310,4 @@ internal CertificateStoreLocationNotFoundException(Exception innerException) } } } - +#endif // !UNIX diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs index 6d15f97a11e..fa2c47c029f 100644 --- a/src/System.Management.Automation/engine/InitialSessionState.cs +++ b/src/System.Management.Automation/engine/InitialSessionState.cs @@ -6031,7 +6031,9 @@ private static void InitializeCoreCmdletsAndProviders( providers = new Dictionary(StringComparer.OrdinalIgnoreCase) { +#if !UNIX { "Registry", new SessionStateProviderEntry("Registry", typeof(RegistryProvider), helpFile) }, +#endif { "Alias", new SessionStateProviderEntry("Alias", typeof(AliasProvider), helpFile) }, { "Environment", new SessionStateProviderEntry("Environment", typeof(EnvironmentProvider), helpFile) }, { "FileSystem" , new SessionStateProviderEntry("FileSystem", typeof(FileSystemProvider), helpFile) }, diff --git a/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs b/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs index 7f654562f83..9fe89d18670 100644 --- a/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs +++ b/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs @@ -798,8 +798,16 @@ internal PSDriveInfo AutomountBuiltInDrive(string name) return result; } // AutomountFileSystemDrive + /// + /// Automatically mount the specified drive + /// + /// + /// Neither 'WSMan' nor 'Certificate' provider works in UNIX PS today. + /// So this method currently does nothing on UNIX. + /// internal static void MountDefaultDrive(string name, ExecutionContext context) { +#if !UNIX PSModuleAutoLoadingPreference moduleAutoLoadingPreference = CommandDiscovery.GetCommandDiscoveryPreference(context, SpecialVariables.PSModuleAutoLoadingPreferenceVarPath, "PSModuleAutoLoadingPreference"); if (moduleAutoLoadingPreference == PSModuleAutoLoadingPreference.None) @@ -837,6 +845,7 @@ internal static void MountDefaultDrive(string name, ExecutionContext context) CommandProcessorBase.CheckForSevereException(exception); } } +#endif } /// diff --git a/src/System.Management.Automation/namespaces/RegistryProvider.cs b/src/System.Management.Automation/namespaces/RegistryProvider.cs index 3db1961f177..a466c8c2d52 100644 --- a/src/System.Management.Automation/namespaces/RegistryProvider.cs +++ b/src/System.Management.Automation/namespaces/RegistryProvider.cs @@ -1,3 +1,4 @@ +#if !UNIX /********************************************************************++ Copyright (c) Microsoft Corporation. All rights reserved. --********************************************************************/ @@ -135,7 +136,6 @@ protected override Collection InitializeDefaultDrives() { Collection drives = new Collection(); -#if !UNIX drives.Add( new PSDriveInfo( "HKLM", @@ -151,7 +151,6 @@ protected override Collection InitializeDefaultDrives() "HKEY_CURRENT_USER", RegistryProviderStrings.HKCUDriveDescription, null)); -#endif return drives; } // InitializeDefaultDrives @@ -5117,5 +5116,4 @@ public class RegistryProviderSetItemDynamicParameter public RegistryValueKind Type { get; set; } = RegistryValueKind.Unknown; } } // namespace System.Management.Automation - - +#endif // !UNIX diff --git a/src/System.Management.Automation/namespaces/RegistrySecurity.cs b/src/System.Management.Automation/namespaces/RegistrySecurity.cs index a5c80c868cb..b08aef4b5dd 100644 --- a/src/System.Management.Automation/namespaces/RegistrySecurity.cs +++ b/src/System.Management.Automation/namespaces/RegistrySecurity.cs @@ -1,3 +1,4 @@ +#if !UNIX /********************************************************************++ Copyright (c) Microsoft Corporation. All rights reserved. --********************************************************************/ @@ -5,7 +6,6 @@ using System; using System.Management.Automation; using System.Management.Automation.Provider; -using Dbg = System.Management.Automation; using System.Security.AccessControl; using Microsoft.PowerShell.Commands.Internal; @@ -221,4 +221,4 @@ public ObjectSecurity NewSecurityDescriptorOfType( #endregion ISecurityDescriptorCmdletProvider members } } - +#endif // !UNIX From dcd8c3de59b085ce06fb762ad243fd3de99ef7e8 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 13 Oct 2016 11:22:45 -0700 Subject: [PATCH 5/6] Fix test failures due to changes in .NET Core and the exclusion of 'Certificate' provider in UNIX PS --- .../Parser/RedirectionOperator.Tests.ps1 | 8 +++++++ .../Get-PSDrive.Tests.ps1 | 23 ++++++++++--------- .../alias.tests.ps1 | 4 ++-- .../clixml.tests.ps1 | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 index 82a79fb7b6d..ef420af1d2f 100644 --- a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 +++ b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 @@ -47,6 +47,14 @@ Describe "Redirection operator now supports encoding changes" -Tags "CI" { $availableEncodings = (get-command out-file).Parameters["Encoding"].Attributes.ValidValues foreach($encoding in $availableEncodings) { + if ($encoding -eq "default") { + # [System.Text.Encoding]::Default is exposed by 'System.Private.CoreLib.dll' at + # runtime via reflection. However,it isn't exposed in the reference contract of + # 'System.Text.Encoding', and therefore we cannot use 'Encoding.Default' in our + # code. So we need to skip this encoding in the test. + continue + } + # some of the encodings accepted by out-file aren't real, # and out-file has its own translation, so we'll # not do that logic here, but simply ignore those encodings diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1 index 75c9d2ac0ae..ceec9a084b9 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1 @@ -23,17 +23,18 @@ Describe "Get-PSDrive" -Tags "CI" { } It "Should return drive info"{ - (Get-PSDrive Env).Name | Should Be Env - (Get-PSDrive Cert).Root | Should Be \ - - if ($IsWindows) - { - (Get-PSDrive C).Provider.Name | Should Be FileSystem - } - else - { - (Get-PSDrive /).Provider.Name | Should Be FileSystem - } + (Get-PSDrive Env).Name | Should Be Env + (Get-PSDrive Alias).Name | Should Be Alias + + if ($IsWindows) + { + (Get-PSDrive Cert).Root | Should Be \ + (Get-PSDrive C).Provider.Name | Should Be FileSystem + } + else + { + (Get-PSDrive /).Provider.Name | Should Be FileSystem + } } It "Should be able to access a drive using the PSProvider switch" { diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/alias.tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/alias.tests.ps1 index 4317e8d2110..75d8272726f 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Utility/alias.tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/alias.tests.ps1 @@ -29,7 +29,7 @@ $testCases += [TestData]::new("PS1", $ps1File, [NullString]::Value) $testCases += [TestData]::new("Empty string", "", "ParameterArgumentValidationErrorEmptyStringNotAllowed,Microsoft.PowerShell.Commands.ExportAliasCommand") $testCases += [TestData]::new("Null", [NullString]::Value, "ParameterArgumentValidationErrorNullNotAllowed,Microsoft.PowerShell.Commands.ExportAliasCommand") - $testCases += [TestData]::new("Non filesystem provider", 'cert:\alias.ps1', "ReadWriteFileNotFileSystemProvider,Microsoft.PowerShell.Commands.ExportAliasCommand") + $testCases += [TestData]::new("Non filesystem provider", 'env:\alias.ps1', "ReadWriteFileNotFileSystemProvider,Microsoft.PowerShell.Commands.ExportAliasCommand") } $testCases | % { @@ -116,7 +116,7 @@ $testCases = @() $testCases += [TestData]::new("Empty string", "", "ParameterArgumentValidationErrorEmptyStringNotAllowed,Microsoft.PowerShell.Commands.ImportAliasCommand") $testCases += [TestData]::new("Null", [NullString]::Value, "ParameterArgumentValidationErrorNullNotAllowed,Microsoft.PowerShell.Commands.ImportAliasCommand") - $testCases += [TestData]::new("Non filesystem provider", 'cert:\alias.ps1', "NotSupported,Microsoft.PowerShell.Commands.ImportAliasCommand") + $testCases += [TestData]::new("Non filesystem provider", 'env:\alias.ps1', "NotSupported,Microsoft.PowerShell.Commands.ImportAliasCommand") } $testCases | % { diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1 index 15477eae9b6..fd8fce29f61 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/clixml.tests.ps1 @@ -44,7 +44,7 @@ $testData = @() $testData += [TestData]::new("with path as Null", [NullString]::Value, $gps, "ParameterArgumentValidationErrorNullNotAllowed,Microsoft.PowerShell.Commands.ExportClixmlCommand") $testData += [TestData]::new("with path as Empty string", "", $gps, "ParameterArgumentValidationErrorEmptyStringNotAllowed,Microsoft.PowerShell.Commands.ExportClixmlCommand") - $testData += [TestData]::new("with path as non filesystem provider", "cert:\", $gps, "ReadWriteFileNotFileSystemProvider,Microsoft.PowerShell.Commands.ExportClixmlCommand") + $testData += [TestData]::new("with path as non filesystem provider", "env:\", $gps, "ReadWriteFileNotFileSystemProvider,Microsoft.PowerShell.Commands.ExportClixmlCommand") } AfterEach { @@ -132,7 +132,7 @@ $testData = @() $testData += [TestData]::new("with path as Null", [NullString]::Value, $null, "ParameterArgumentValidationErrorNullNotAllowed,Microsoft.PowerShell.Commands.ImportClixmlCommand") $testData += [TestData]::new("with path as Empty string", "", $null, "ParameterArgumentValidationErrorEmptyStringNotAllowed,Microsoft.PowerShell.Commands.ImportClixmlCommand") - $testData += [TestData]::new("with path as non filesystem provider", "cert:\", $null, "ReadWriteFileNotFileSystemProvider,Microsoft.PowerShell.Commands.ImportClixmlCommand") + $testData += [TestData]::new("with path as non filesystem provider", "env:\", $null, "ReadWriteFileNotFileSystemProvider,Microsoft.PowerShell.Commands.ImportClixmlCommand") } $testData | % { From e807b4fe4422a6a60e8e501713c9b008408ef474 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 13 Oct 2016 15:55:59 -0700 Subject: [PATCH 6/6] Make Pester skip the redirection test for '[Encoding]::Default' instead of ignoring it, so that we can keep track of this encoding issue --- .../powershell/Language/Parser/RedirectionOperator.Tests.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 index ef420af1d2f..a9096a51a43 100644 --- a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 +++ b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 @@ -47,12 +47,13 @@ Describe "Redirection operator now supports encoding changes" -Tags "CI" { $availableEncodings = (get-command out-file).Parameters["Encoding"].Attributes.ValidValues foreach($encoding in $availableEncodings) { + $skipTest = $false if ($encoding -eq "default") { # [System.Text.Encoding]::Default is exposed by 'System.Private.CoreLib.dll' at # runtime via reflection. However,it isn't exposed in the reference contract of # 'System.Text.Encoding', and therefore we cannot use 'Encoding.Default' in our # code. So we need to skip this encoding in the test. - continue + $skipTest = $true } # some of the encodings accepted by out-file aren't real, @@ -71,7 +72,7 @@ Describe "Redirection operator now supports encoding changes" -Tags "CI" { $asciiString > TESTDRIVE:/file.txt $observedBytes = Get-Content -encoding Byte TESTDRIVE:/file.txt # THE TEST - It $msg { + It $msg -Skip:$skipTest { $observedBytes.Count | Should be $expectedBytes.Count for($i = 0;$i -lt $observedBytes.Count; $i++) { $observedBytes[$i] | Should be $expectedBytes[$i]