diff --git a/nuget.config b/nuget.config index d9d1dfbc06..dbe018d3eb 100644 --- a/nuget.config +++ b/nuget.config @@ -3,6 +3,7 @@ + diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index f085ddc64c..87e84dc7df 100644 --- a/src/Microsoft.Management.Infrastructure.Native/project.json +++ b/src/Microsoft.Management.Infrastructure.Native/project.json @@ -6,7 +6,7 @@ "frameworks": { "dnxcore50": { "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23729", + "NETStandard.Library": "1.0.0-rc3-23817", "System.Security.SecureString": { "type": "build", "version": "1.0.0-*" diff --git a/src/Microsoft.Management.Infrastructure/project.json b/src/Microsoft.Management.Infrastructure/project.json index 33e249fb91..98b69706e4 100644 --- a/src/Microsoft.Management.Infrastructure/project.json +++ b/src/Microsoft.Management.Infrastructure/project.json @@ -20,8 +20,8 @@ "define": [ "_CORECLR" ] }, "dependencies": { - "System.Runtime.Serialization.Xml": "4.1.0-rc3-23729", - "System.Threading.ThreadPool": "4.0.10-rc3-23729" + "System.Runtime.Serialization.Xml": "4.1.0-rc3-23817", + "System.Threading.ThreadPool": "4.0.10-rc3-23817" } }, "dnx451": { diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 0c7e13c818..663f33bc67 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -20,8 +20,8 @@ "define": [ "CORECLR" ] }, "dependencies": { - "System.ServiceProcess.ServiceController": "4.1.0-rc3-23729", - "System.Net.NameResolution": "4.0.0-rc3-23729" + "System.ServiceProcess.ServiceController": "4.1.0-rc3-23817", + "System.Net.NameResolution": "4.0.0-rc3-23817" } }, "dnx451": { diff --git a/src/Microsoft.PowerShell.Commands.Omi/DscConfiguration.cs b/src/Microsoft.PowerShell.Commands.Omi/DscConfiguration.cs deleted file mode 100644 index cd2c6d5fc7..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/DscConfiguration.cs +++ /dev/null @@ -1,129 +0,0 @@ -/********************************************************************++ -Copyright (c) Microsoft Corporation. All rights reserved. ---********************************************************************/ -using System; -using System.IO; -using System.Text; -using System.Management.Automation; - -namespace Microsoft.PowerShell.Commands.Omi -{ - #region Start-DscConfiguration - - /// - /// implementation for the Start-DscConfiguration command - /// - [Cmdlet( VerbsLifecycle.Start, "DscConfiguration" )] - [OutputType(typeof(object))] - public sealed class StartDscConfigurationCommand : Cmdlet - { - #region parameters - - [Parameter(Mandatory = true)] - [Alias("CM")] - public string ConfigurationMof - { - get - { - return mofPath; - } - set - { - mofPath = value; - } - } - private string mofPath; - - #endregion - - #region methods - - protected override void ProcessRecord() - { - if (mofPath == null) - { - throw new ArgumentNullException(); - } - - if (!Platform.IsLinux()) - { - throw new PlatformNotSupportedException(); - } - - OmiInterface oi = new OmiInterface(); - - const string nameSpace = "root/Microsoft/DesiredStateConfiguration"; - const string instanceName = "{ MSFT_DSCLocalConfigurationManager }"; - const string methodName = "SendConfigurationApply"; - - string mof = File.ReadAllText(mofPath); - byte[] asciiBytes = Encoding.ASCII.GetBytes(mof); - - StringBuilder sb = new StringBuilder(); - sb.Append(" { ConfigurationData [ "); - foreach (byte b in asciiBytes) - { - sb.Append(b.ToString()); - sb.Append(' '); - } - sb.Append("] "); - sb.Append("}"); - string parameters = sb.ToString(); - - string arguments = $"iv {nameSpace} {instanceName} {methodName} {parameters} -xml"; - oi.ExecuteOmiCliCommand(arguments); - - OmiData data = oi.GetOmiData(); - object[] array = data.ToObjectArray(); - - WriteObject(array, true); - - } // EndProcessing - - #endregion - } - - #endregion - - #region Get-DscConfiguration - - /// - /// implementation for the Get-DscConfiguration command - /// - [Cmdlet( VerbsCommon.Get, "DscConfiguration" )] - [OutputType(typeof(object))] - public sealed class GetDscConfigurationCommand : Cmdlet - { - #region methods - - protected override void ProcessRecord() - { - if (!Platform.IsLinux()) - { - throw new PlatformNotSupportedException(); - } - - OmiInterface oi = new OmiInterface(); - - const string nameSpace = "root/Microsoft/DesiredStateConfiguration"; - const string instanceName = "{ MSFT_DSCLocalConfigurationManager }"; - const string methodName = "GetConfiguration"; - - string arguments = $"iv {nameSpace} {instanceName} {methodName} -xml"; - oi.ExecuteOmiCliCommand(arguments); - - OmiData data = oi.GetOmiData(); - object[] array = data.ToObjectArray(); - - WriteObject(array, true); - - } // EndProcessing - - #endregion - } - - #endregion - -} // namespace Microsoft.PowerShell.Commands - - diff --git a/src/Microsoft.PowerShell.Commands.Omi/DscLocalConfiguration.cs b/src/Microsoft.PowerShell.Commands.Omi/DscLocalConfiguration.cs deleted file mode 100644 index 1f5dbe2ced..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/DscLocalConfiguration.cs +++ /dev/null @@ -1,129 +0,0 @@ -/********************************************************************++ -Copyright (c) Microsoft Corporation. All rights reserved. ---********************************************************************/ -using System; -using System.IO; -using System.Text; -using System.Management.Automation; - -namespace Microsoft.PowerShell.Commands.Omi -{ - #region Set-DscLocalConfigurationManager - - /// - /// implementation for the Set-DscLocalConfiguration command - /// - [Cmdlet(VerbsCommon.Set, "DscLocalConfigurationManager" )] - [OutputType(typeof(object))] - public sealed class SetDscLocalConfigurationManagerCommand : Cmdlet - { - #region parameters - - [Parameter(Mandatory = true)] - [Alias("CM")] - public string ConfigurationMof - { - get - { - return mofPath; - } - set - { - mofPath = value; - } - } - private string mofPath; - - #endregion - - #region methods - - protected override void ProcessRecord() - { - if (mofPath == null) - { - throw new ArgumentNullException(); - } - - if (!Platform.IsLinux()) - { - throw new PlatformNotSupportedException(); - } - - OmiInterface oi = new OmiInterface(); - - const string nameSpace = "root/Microsoft/DesiredStateConfiguration"; - const string instanceName = "{ MSFT_DSCLocalConfigurationManager }"; - const string methodName = "SendMetaConfigurationApply"; - - string mof = File.ReadAllText(mofPath); - byte[] asciiBytes = Encoding.ASCII.GetBytes(mof); - - StringBuilder sb = new StringBuilder(); - sb.Append(" { ConfigurationData [ "); - foreach (byte b in asciiBytes) - { - sb.Append(b.ToString()); - sb.Append(' '); - } - sb.Append("] "); - sb.Append("}"); - string parameters = sb.ToString(); - - string arguments = $"iv {nameSpace} {instanceName} {methodName} {parameters} -xml"; - oi.ExecuteOmiCliCommand(arguments); - - OmiData data = oi.GetOmiData(); - object[] array = data.ToObjectArray(); - - WriteObject(array, true); - - } // EndProcessing - - #endregion - } - - #endregion - - #region Get-DscLocalConfigurationManager - - /// - /// implementation for the Get-DscLocalConfigurationManager command - /// - [Cmdlet(VerbsCommon.Get, "DscLocalConfigurationManager" )] - [OutputType(typeof(object))] - public sealed class GetDscLocalConfigurationManagerCommand : Cmdlet - { - #region methods - - protected override void ProcessRecord() - { - if (!Platform.IsLinux()) - { - throw new PlatformNotSupportedException(); - } - - OmiInterface oi = new OmiInterface(); - - const string nameSpace = "root/Microsoft/DesiredStateConfiguration"; - const string instanceName = "{ MSFT_DSCLocalConfigurationManager }"; - const string methodName = "GetMetaConfiguration"; - - string arguments = $"iv {nameSpace} {instanceName} {methodName} -xml"; - oi.ExecuteOmiCliCommand(arguments); - - OmiData data = oi.GetOmiData(); - object[] array = data.ToObjectArray(); - - WriteObject(array, true); - - } // EndProcessing - - #endregion - } - - #endregion - -} // namespace Microsoft.PowerShell.Commands - - diff --git a/src/Microsoft.PowerShell.Commands.Omi/GetOmiInstance.cs b/src/Microsoft.PowerShell.Commands.Omi/GetOmiInstance.cs deleted file mode 100644 index 2546b15db3..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/GetOmiInstance.cs +++ /dev/null @@ -1,120 +0,0 @@ -/********************************************************************++ -Copyright (c) Microsoft Corporation. All rights reserved. ---********************************************************************/ -using System; -using System.Xml.Linq; -using System.Collections; -using System.Collections.Generic; -using System.Management.Automation; - -namespace Microsoft.PowerShell.Commands.Omi -{ - #region Get-OmiInstance - - /// - /// implementation for the Get-OmiInstance command - /// - [Cmdlet( VerbsCommon.Get, "OmiInstance" )] - [OutputType(typeof(string))] - [OutputType(typeof(object[]))] - public sealed class GetOmiInstanceCommand : Cmdlet - { - #region parameters - - [Parameter(Mandatory = true)] - [Alias("NS")] - public string Namespace - { - get - { - return nameSpace; - } - set - { - nameSpace = value; - } - } - private string nameSpace; - - [Parameter(Mandatory = true)] - [Alias("CN")] - public string ClassName - { - get - { - return className; - } - set - { - className = value; - } - } - private string className; - - [Parameter] - public string Property - { - get - { - return property; - } - set - { - property = value; - propertySpecified = true; - } - } - private string property; - private bool propertySpecified = false; - - #endregion - - #region methods - - protected override void ProcessRecord() - { - if (nameSpace == null || className == null) - { - throw new ArgumentNullException(); - } - - if (!Platform.IsLinux()) - { - throw new PlatformNotSupportedException(); - } - - OmiInterface oi = new OmiInterface(); - - string arguments = $"ei {nameSpace} {className} -xml"; - oi.ExecuteOmiCliCommand(arguments); - - if (propertySpecified) - { - if (property == null) - { - throw new ArgumentNullException(); - } - - string value; - string type; - oi.GetValue(className, property, out type, out value); - - WriteObject(value); - return; - } - - OmiData data = oi.GetOmiData(); - object[] array = data.ToObjectArray(); - - WriteObject(array, true); - - } // EndProcessing - - #endregion - } - - #endregion - -} // namespace Microsoft.PowerShell.Commands - - diff --git a/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs b/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs deleted file mode 100644 index dcae1f4b17..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs +++ /dev/null @@ -1,235 +0,0 @@ -/********************************************************************++ -Copyright (c) Microsoft Corporation. All rights reserved. ---********************************************************************/ - -using System; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Xml.Linq; -using System.Runtime.InteropServices; -using System.Management.Automation; - -namespace Microsoft.PowerShell.Commands.Omi -{ - internal static class Platform - { - internal static bool IsLinux() - { - return RuntimeInformation.IsOSPlatform(OSPlatform.Linux); - } - - internal static bool IsWindows() - { - return RuntimeInformation.IsOSPlatform(OSPlatform.Windows); - } - } - - /// - /// Data from OMI - /// - public class OmiData - { - public HashSet Properties; - public HashSet> Values; - public OmiData() - { - Properties = new HashSet(); - Values = new HashSet>(); - } - public void Debug() - { - foreach (string p in Properties) - { - Console.Write("{0,-22}", p); - } - Console.WriteLine(); - - foreach (Dictionary d in Values) - { - foreach (string p in Properties) - { - string value = String.Empty; - if (d.ContainsKey(p)) - { - value = Truncate(d[p], 16); - } - Console.Write("{0,-22}", value); - } - Console.WriteLine(); - } - } - - public Object[] ToObjectArray() - { - // Convert to array of objects - ArrayList array = new ArrayList(); - foreach (Dictionary d in Values) - { - PSObject o = new PSObject(); - - foreach (string p in Properties) - { - string value = String.Empty; - if (d.ContainsKey(p)) - { - value = d[p]; - } - PSNoteProperty psp = new PSNoteProperty(p, value); - o.Members.Add(psp); - } - array.Add(o); - } - - return (Object[])(array.ToArray()); - } - - private string Truncate(string s, int maxChars) - { - return s.Length < maxChars ? s : s.Substring(0, maxChars) + " ..."; - } - } - - /// - /// Interfaces that cmdlets can use to interface with OMI - /// - public class OmiInterface - { - private string _xmlString = null; - - public void ExecuteOmiCliCommand(string arguments) - { - using (Process process = new Process()) - { - // Assume omicli is somewhere in PATH... - process.StartInfo.FileName = "omicli"; - process.StartInfo.Arguments = arguments; - process.StartInfo.UseShellExecute = false; - process.StartInfo.RedirectStandardOutput = true; - process.StartInfo.CreateNoWindow = true; - - process.Start(); - - string output = process.StandardOutput.ReadToEnd(); - - process.WaitForExit(); - if (process.ExitCode != 0) - { - throw new IOException(); - } - - _xmlString = $"{output}"; - } - return; - } - - public void GetValue(string className, string propertyName, out string type, out string value) - { - // parse xml - XElement cim = XElement.Parse(_xmlString); - - IEnumerable elements = - from el in cim.Elements("INSTANCE") - where (string)el.Attribute("CLASSNAME") == className - select el; - - IEnumerable properties = - from el in elements.First().Elements("PROPERTY") - where (string)el.Attribute("NAME") == propertyName - select el; - - XElement property = properties.First(); - XElement p = property.Element("VALUE"); - - type = (string)property.Attribute("TYPE"); - value = p.Value; - } - - private IEnumerable GetValueIEnumerable() - { - // parse xml - XElement cim = XElement.Parse(_xmlString); - - IEnumerable elements = cim.Elements(); - return elements; - } - - public OmiData GetOmiData() - { - OmiData data = new OmiData(); - - const string VALUE = "VALUE"; - const string VALUEARRAY = "VALUE.ARRAY"; - const string PROPERTY = "PROPERTY"; - const string PROPERTYARRAY = "PROPERTY.ARRAY"; - - IEnumerable instances = GetValueIEnumerable(); - foreach (XElement instance in instances) - { - // First, do PROPERTY elements - IEnumerable properties = instance.Elements(PROPERTY); - - foreach (XElement property in properties) - { - Dictionary d = new Dictionary(); - IEnumerable attrs = property.Attributes(); - - foreach (XAttribute attr in attrs) - { - data.Properties.Add(attr.Name.LocalName); - d[attr.Name.LocalName] = attr.Value; - } - - // Now look for "VALUE" sub-element - IEnumerable values = property.Elements(VALUE); - foreach (XElement value in values) - { - data.Properties.Add(VALUE); - d[VALUE] = value.Value; - } - - data.Values.Add(d); - } - - // Next, do PROPERTY.ARRAY elements - IEnumerable propertyArrays = instance.Elements(PROPERTYARRAY); - foreach (XElement property in propertyArrays) - { - Dictionary dCommon = new Dictionary(); - IEnumerable attrs = property.Attributes(); - - foreach (XAttribute attr in attrs) - { - data.Properties.Add(attr.Name.LocalName); - dCommon[attr.Name.LocalName] = attr.Value; - } - - IEnumerable valueArrays = property.Elements(VALUEARRAY); - - if (valueArrays.Count() > 0) - { - foreach (XElement valueArray in valueArrays) - { - IEnumerable values = valueArray.Elements(VALUE); - foreach (XElement value in values) - { - Dictionary d = new Dictionary(dCommon); - data.Properties.Add(VALUE); - d[VALUE] = value.Value; - data.Values.Add(d); - } - } - } - else - { - data.Values.Add(dCommon); - } - } - } - - return data; - } - } -} diff --git a/src/Microsoft.PowerShell.Commands.Omi/project.json b/src/Microsoft.PowerShell.Commands.Omi/project.json deleted file mode 100644 index b7af3aeb2b..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "Microsoft.PowerShell.Commands.Omi Library", - "authors": [ "palladia", "andschwa" ], - - "dependencies": { - "System.Management.Automation": { - "type": "build", - "version": "1.0.0-*" - } - }, - - "frameworks": { - "dnxcore50": { - "dependencies": { - "System.Xml.XDocument": "4.0.11-rc3-23729" - } - } - } -} diff --git a/src/Microsoft.PowerShell.Commands.Omi/test/Get-OmiInstance.Tests.ps1 b/src/Microsoft.PowerShell.Commands.Omi/test/Get-OmiInstance.Tests.ps1 deleted file mode 100644 index 3665ab62c9..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/test/Get-OmiInstance.Tests.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -# Note that omicli must be in PATH and omiserver should be started with -# --ignoreAuthentication option - -Describe "Get-OmiInstance" { - Import-Module Microsoft.PowerShell.Commands.Omi - - It "Should execute basic command correctly" { - $instance = Get-OmiInstance -NameSpace root/omi -ClassName OMI_Identify - - # This test is a workaround - $instance.Value.Contains("OMI") | Should Be $true - - # TODO: test these when available - #$instance.ProductName | Should Be "OMI" - #$instance.ProductVendor | Should Be "Microsoft" - #$instance.OperatingSystem | Should Be "LINUX" - } -} diff --git a/src/Microsoft.PowerShell.Commands.Omi/test/Start-DscConfiguration.Tests.ps1 b/src/Microsoft.PowerShell.Commands.Omi/test/Start-DscConfiguration.Tests.ps1 deleted file mode 100644 index e0739ab968..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/test/Start-DscConfiguration.Tests.ps1 +++ /dev/null @@ -1,43 +0,0 @@ -# Note that omicli must be in PATH and omiserver should be started with -# --ignoreAuthentication option - -$here = Split-Path -Parent $MyInvocation.MyCommand.Path -$mof = "$here/sample.mof" -$mofCleanup = "$here/sample-cleanup.mof" -$mofMeta = "$here/sampleMeta.mof" -$file = "/tmp/linux.txt" - -Describe "DscConfiguration" { - Import-Module Microsoft.PowerShell.Commands.Omi - - It "Should create file per sample MOF file" { - $s = Start-DscConfiguration -ConfigurationMof $mof | - Where-Object {$_.NAME -eq "ReturnValue"} - $s.VALUE | Should Be "0" - $file | Should Exist - } - - It "Should get DSC configuration successfully" { - $s = Get-DscConfiguration | Where-Object {$_.NAME -eq "ReturnValue"} - $s.VALUE | Should Be "0" - } - - It "Should remove temp file just created" { - $s = Start-DscConfiguration -ConfigurationMof $mofCleanup | - Where-Object {$_.NAME -eq "ReturnValue"} - $s.VALUE | Should Be "0" - $file | Should Not Exist - } - - It "Should set Meta MOF file properly" { - $s = Set-DscLocalConfigurationManager -ConfigurationMof $mofMeta | - Where-Object {$_.NAME -eq "ReturnValue"} - $s.VALUE | Should Be "0" - } - - It "Should get DSC local configuration successfully" { - $s = Get-DscLocalConfigurationManager | Where-Object {$_.NAME -eq "ReturnValue"} - $s.VALUE | Should Be "0" - } - -} diff --git a/src/Microsoft.PowerShell.Commands.Omi/test/sample-cleanup.mof b/src/Microsoft.PowerShell.Commands.Omi/test/sample-cleanup.mof deleted file mode 100644 index c1202308e6..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/test/sample-cleanup.mof +++ /dev/null @@ -1,19 +0,0 @@ -instance of MSFT_nxFileResource -{ - Contents = "my contents"; - DestinationPath = "/tmp/linux.txt"; - Ensure = "Absent"; - Type = "File"; - ResourceId = "[MSFT_nxFileResource]File1"; - ModuleName = "nx"; - ModuleVersion = "1.0"; - - -}; - -instance of OMI_ConfigurationDocument -{ - Version="1.0.0"; - -}; - diff --git a/src/Microsoft.PowerShell.Commands.Omi/test/sample.mof b/src/Microsoft.PowerShell.Commands.Omi/test/sample.mof deleted file mode 100644 index cb2d4b33dd..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/test/sample.mof +++ /dev/null @@ -1,22 +0,0 @@ -instance of MSFT_nxFileResource -{ - Contents = "my contents"; - DestinationPath = "/tmp/linux.txt"; - Ensure = "Present"; - Type = "File"; - Owner = "root"; - Group = "root"; - Mode = "644"; - ResourceId = "[MSFT_nxFileResource]File1"; - ModuleName = "nx"; - ModuleVersion = "1.0"; - - -}; - -instance of OMI_ConfigurationDocument -{ - Version="1.0.0"; - -}; - diff --git a/src/Microsoft.PowerShell.Commands.Omi/test/sampleMeta.mof b/src/Microsoft.PowerShell.Commands.Omi/test/sampleMeta.mof deleted file mode 100644 index f811287cc9..0000000000 --- a/src/Microsoft.PowerShell.Commands.Omi/test/sampleMeta.mof +++ /dev/null @@ -1,24 +0,0 @@ -/* -@TargetNode='10.199.192.181' -@GeneratedBy=johnkord -@GenerationDate=01/15/2015 14:34:29 -@GenerationHost=JKORDIC-1 -*/ - - -instance of MSFT_DSCMetaConfiguration as $MSFT_DSCMetaConfiguration1ref -{ -DownloadManagerName = "WebDownloadManager"; -RefreshMode = "Push"; -ConfigurationMode = "ApplyAndAutoCorrect"; - -}; - -instance of OMI_ConfigurationDocument -{ -Version="1.0.0"; -Author="johnkord"; -GenerationDate="01/15/2015 14:34:29"; -GenerationHost="JKORDIC-1"; -}; - diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs index b37d1d78c8..953d4516ae 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs @@ -14,7 +14,7 @@ namespace System.Management.Automation { private Dictionary InitializeTypeCatalog() { - Dictionary typeCatalog = new Dictionary(1812, StringComparer.OrdinalIgnoreCase); + Dictionary typeCatalog = new Dictionary(1815, StringComparer.OrdinalIgnoreCase); typeCatalog["Microsoft.CSharp.RuntimeBinder.Binder"] = "Microsoft.CSharp, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo"] = "Microsoft.CSharp, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfoFlags"] = "Microsoft.CSharp, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -771,11 +771,11 @@ namespace System.Management.Automation typeCatalog["System.Text.UTF8Encoding"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Text.UTF32Encoding"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Diagnostics.DebuggableAttribute+DebuggingModes"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; - typeCatalog["System.Diagnostics.Tracing.EventProvider+SessionInfo"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Diagnostics.Tracing.EventProvider+WriteEventErrorCode"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Diagnostics.Tracing.FrameworkEventSource+Keywords"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Diagnostics.Tracing.FrameworkEventSource+Tasks"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Diagnostics.Tracing.FrameworkEventSource+Opcodes"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; + typeCatalog["System.Diagnostics.Tracing.PropertyValue+Scalar"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Collections.ObjectModel.ReadOnlyDictionary`2+KeyCollection"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Collections.ObjectModel.ReadOnlyDictionary`2+ValueCollection"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Collections.Generic.Dictionary`2+Enumerator"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; @@ -794,16 +794,17 @@ namespace System.Management.Automation typeCatalog["System.Runtime.InteropServices.ComTypes.VARDESC+DESCUNION"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Collections.Generic.Dictionary`2+KeyCollection+Enumerator"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; typeCatalog["System.Collections.Generic.Dictionary`2+ValueCollection+Enumerator"] = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"; - typeCatalog["System.Collections.Concurrent.BlockingCollection`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.ConcurrentBag`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.ConcurrentDictionary`2"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.ConcurrentQueue`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.ConcurrentStack`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.IProducerConsumerCollection`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.OrderablePartitioner`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.Partitioner`1"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.EnumerablePartitionerOptions"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Concurrent.Partitioner"] = "System.Collections.Concurrent, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Buffers.ArrayPool`1"] = "System.Buffers, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"; + typeCatalog["System.Collections.Concurrent.BlockingCollection`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.ConcurrentBag`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.ConcurrentDictionary`2"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.ConcurrentQueue`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.ConcurrentStack`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.IProducerConsumerCollection`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.OrderablePartitioner`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.Partitioner`1"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.EnumerablePartitionerOptions"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Concurrent.Partitioner"] = "System.Collections.Concurrent, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Collections.Generic.HashSet`1"] = "System.Collections, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Collections.Generic.LinkedList`1"] = "System.Collections, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Collections.Generic.LinkedListNode`1"] = "System.Collections, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -958,22 +959,11 @@ namespace System.Management.Automation typeCatalog["System.Data.Common.DbParameterCollection"] = "System.Data.Common, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Data.Common.DbProviderFactory"] = "System.Data.Common, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Data.Common.DbTransaction"] = "System.Data.Common, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Data.Common.DbDataReaderExtensions"] = "System.Data.Common, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Data.Common.DbColumn"] = "System.Data.Common, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Data.Common.IDbColumnSchemaGenerator"] = "System.Data.Common, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Diagnostics.Debug"] = "System.Diagnostics.Debug, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Diagnostics.FileVersionInfo"] = "System.Diagnostics.FileVersionInfo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.DataReceivedEventHandler"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.DataReceivedEventArgs"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.Process"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessModule"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessModuleCollection"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessPriorityClass"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessStartInfo"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessThread"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessThreadCollection"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ProcessWindowStyle"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ThreadPriorityLevel"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ThreadState"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.ThreadWaitReason"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["Microsoft.Win32.SafeHandles.SafeProcessHandle"] = "System.Diagnostics.Process, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.CodeDom.Compiler.GeneratedCodeAttribute"] = "System.Diagnostics.Tools, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Diagnostics.BooleanSwitch"] = "System.Diagnostics.TraceSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Diagnostics.DefaultTraceListener"] = "System.Diagnostics.TraceSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -992,7 +982,7 @@ namespace System.Management.Automation typeCatalog["System.Diagnostics.TraceOptions"] = "System.Diagnostics.TraceSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Diagnostics.TraceSource"] = "System.Diagnostics.TraceSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Diagnostics.TraceSwitch"] = "System.Diagnostics.TraceSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.Tracing.EventCounter"] = "System.Diagnostics.Tracing, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Diagnostics.Tracing.EventCounter"] = "System.Diagnostics.Tracing, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.CompilerServices.CallSite"] = "System.Dynamic.Runtime, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.CompilerServices.CallSite`1"] = "System.Dynamic.Runtime, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.CompilerServices.CallSiteBinder"] = "System.Dynamic.Runtime, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1033,9 +1023,10 @@ namespace System.Management.Automation typeCatalog["System.Linq.Expressions.Compiler.DelegateHelpers+VBCallSiteDelegate7`1"] = "System.Dynamic.Runtime, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.StringNormalizationExtensions"] = "System.Globalization.Extensions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Text.NormalizationForm"] = "System.Globalization.Extensions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Globalization.IdnMapping"] = "System.Globalization.Extensions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Globalization.GlobalizationExtensions"] = "System.Globalization.Extensions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.IO.InvalidDataException"] = "System.IO, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Globalization.IdnMapping"] = "System.Globalization.Extensions, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.IO.BufferedStream"] = "System.IO, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.IO.InvalidDataException"] = "System.IO, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.IO.FileSystemAclExtensions"] = "System.IO.FileSystem.AccessControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.AccessControl.FileSystemRights"] = "System.IO.FileSystem.AccessControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.AccessControl.FileSystemAccessRule"] = "System.IO.FileSystem.AccessControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1077,12 +1068,12 @@ namespace System.Management.Automation typeCatalog["System.IO.Pipes.NamedPipeServerStream"] = "System.IO.Pipes, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.IO.Pipes.PipeStream"] = "System.IO.Pipes, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["Microsoft.Win32.SafeHandles.SafePipeHandle"] = "System.IO.Pipes, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Linq.Enumerable"] = "System.Linq, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Linq.IOrderedEnumerable`1"] = "System.Linq, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Linq.IGrouping`2"] = "System.Linq, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Linq.ILookup`2"] = "System.Linq, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Linq.Lookup`2"] = "System.Linq, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Linq.Grouping`2"] = "System.Linq, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Linq.Enumerable"] = "System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Linq.IGrouping`2"] = "System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Linq.Grouping`2"] = "System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Linq.ILookup`2"] = "System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Linq.Lookup`2"] = "System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Linq.IOrderedEnumerable`1"] = "System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.CompilerServices.IRuntimeVariables"] = "System.Linq.Expressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.CompilerServices.Closure"] = "System.Linq.Expressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Linq.IQueryable"] = "System.Linq.Expressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1176,9 +1167,13 @@ namespace System.Management.Automation typeCatalog["System.Net.Http.Headers.TransferCodingWithQualityHeaderValue"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Http.Headers.ViaHeaderValue"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Http.Headers.WarningHeaderValue"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.HttpEventSource+Keywords"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.NetEventSource+Keywords"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.NetEventSource+ComponentType"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog[".Interop+Http+SeekCallback"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog[".Interop+Http+ReadWriteCallback"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog[".Interop+Http+SslCtxCallback"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog[".Interop+Http+DebugCallback"] = "System.Net.Http, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Dns"] = "System.Net.NameResolution, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.IPHostEntry"] = "System.Net.NameResolution, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Internals.ProtocolType"] = "System.Net.NameResolution, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1262,6 +1257,9 @@ namespace System.Management.Automation typeCatalog["System.Net.Sockets.AddressFamily"] = "System.Net.Primitives, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.SocketError"] = "System.Net.Primitives, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.TransportType"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.Sockets.SocketReceiveFromResult"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.Sockets.SocketReceiveMessageFromResult"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.Sockets.SocketTaskExtensions"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.IOControlCode"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.IPPacketInformation"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.IPProtectionLevel"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1277,10 +1275,7 @@ namespace System.Management.Automation typeCatalog["System.Net.Sockets.SocketFlags"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.SocketOptionLevel"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.SocketOptionName"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Net.Sockets.SocketReceiveFromResult"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Net.Sockets.SocketReceiveMessageFromResult"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.SocketShutdown"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Net.Sockets.SocketTaskExtensions"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.TcpClient"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.TcpListener"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.UdpClient"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1288,21 +1283,22 @@ namespace System.Management.Automation typeCatalog["System.Net.Sockets.IPAddressExtensions"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.ProtocolType"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Net.Sockets.SocketType"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Windows.Input.ICommand"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.DataErrorsChangedEventArgs"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.INotifyDataErrorInfo"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.INotifyPropertyChanged"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.INotifyPropertyChanging"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.PropertyChangedEventArgs"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.PropertyChangedEventHandler"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.PropertyChangingEventArgs"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.PropertyChangingEventHandler"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.ObjectModel.ObservableCollection`1"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.ObjectModel.ReadOnlyObservableCollection`1"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Specialized.INotifyCollectionChanged"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Specialized.NotifyCollectionChangedAction"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Specialized.NotifyCollectionChangedEventArgs"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Specialized.NotifyCollectionChangedEventHandler"] = "System.ObjectModel, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.SocketsEventSource+Keywords"] = "System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Windows.Input.ICommand"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.DataErrorsChangedEventArgs"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.INotifyDataErrorInfo"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.INotifyPropertyChanged"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.INotifyPropertyChanging"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.PropertyChangedEventArgs"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.PropertyChangedEventHandler"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.PropertyChangingEventArgs"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.PropertyChangingEventHandler"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.ObjectModel.ObservableCollection`1"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.ObjectModel.ReadOnlyObservableCollection`1"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Specialized.INotifyCollectionChanged"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Specialized.NotifyCollectionChangedAction"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Specialized.NotifyCollectionChangedEventArgs"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Specialized.NotifyCollectionChangedEventHandler"] = "System.ObjectModel, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Uri"] = "System.Private.Uri, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.UriBuilder"] = "System.Private.Uri, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.UriKind"] = "System.Private.Uri, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1310,6 +1306,7 @@ namespace System.Management.Automation typeCatalog["System.UriFormat"] = "System.Private.Uri, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.UriFormatException"] = "System.Private.Uri, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.UriHostNameType"] = "System.Private.Uri, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Reflection.MethodSemanticsAttributes"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.DeclarativeSecurityAction"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.MethodImportAttributes"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.ManifestResourceAttributes"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1318,6 +1315,9 @@ namespace System.Management.Automation typeCatalog["System.Reflection.PortableExecutable.CoffHeader"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.PortableExecutable.CorFlags"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.PortableExecutable.CorHeader"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Reflection.PortableExecutable.CodeViewDebugDirectoryData"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Reflection.PortableExecutable.DebugDirectoryEntry"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Reflection.PortableExecutable.DebugDirectoryEntryType"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.PortableExecutable.DirectoryEntry"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.PortableExecutable.Machine"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.PortableExecutable.Characteristics"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1404,6 +1404,7 @@ namespace System.Management.Automation typeCatalog["System.Reflection.Metadata.InterfaceImplementation"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.ManifestResource"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.MemberReference"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Reflection.Metadata.StandaloneSignatureKind"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.MemberReferenceKind"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.MetadataKind"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.MetadataReader"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1469,6 +1470,7 @@ namespace System.Management.Automation typeCatalog["System.Reflection.Metadata.Ecma335.MetadataTokens"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.Ecma335.TableIndex"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.Ecma335.MetadataAggregator"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Reflection.BlobBuilder+Blobs"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.GenericParameterHandleCollection+Enumerator"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.GenericParameterConstraintHandleCollection+Enumerator"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.Metadata.CustomAttributeHandleCollection+Enumerator"] = "System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1504,45 +1506,46 @@ namespace System.Management.Automation typeCatalog["System.Reflection.MethodInfoExtensions"] = "System.Reflection.TypeExtensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.ModuleExtensions"] = "System.Reflection.TypeExtensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Reflection.PropertyInfoExtensions"] = "System.Reflection.TypeExtensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`9"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`10"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`11"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`12"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`13"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`14"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`15"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Action`16"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`10"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`11"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`12"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`13"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`14"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`15"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`16"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Func`17"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Lazy`2"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.CompilerServices.StrongBox`1"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.CompilerServices.IStrongBox"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.EditorBrowsableAttribute"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.EditorBrowsableState"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.ComponentModel.DefaultValueAttribute"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Collections.Generic.ISet`1"] = "System.Runtime, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.Versioning.FrameworkName"] = "System.Runtime.Extensions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Net.WebUtility"] = "System.Runtime.Extensions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Diagnostics.Stopwatch"] = "System.Runtime.Extensions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`9"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`10"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`11"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`12"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`13"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`14"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`15"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Action`16"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`10"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`11"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`12"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`13"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`14"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`15"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`16"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Func`17"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Lazy`2"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.CompilerServices.StrongBox`1"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.CompilerServices.IStrongBox"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.EditorBrowsableAttribute"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.EditorBrowsableState"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.ComponentModel.DefaultValueAttribute"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Collections.Generic.ISet`1"] = "System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.Versioning.FrameworkName"] = "System.Runtime.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Net.WebUtility"] = "System.Runtime.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Diagnostics.Stopwatch"] = "System.Runtime.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.IO.HandleInheritability"] = "System.Runtime.Handles, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComAwareEventInfo"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.HandleCollector"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.DefaultParameterValueAttribute"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.ADVF"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.DATADIR"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.DVASPECT"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.FORMATETC"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.IAdviseSink"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.IEnumFORMATETC"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.STATDATA"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.STGMEDIUM"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.InteropServices.ComTypes.TYMED"] = "System.Runtime.InteropServices, Version=4.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComAwareEventInfo"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.ADVF"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.DATADIR"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.DVASPECT"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.FORMATETC"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.IAdviseSink"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.IEnumFORMATETC"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.STATDATA"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.STGMEDIUM"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.ComTypes.TYMED"] = "System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.PInvokeMarshal"] = "System.Runtime.InteropServices.PInvoke, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.HandleCollector"] = "System.Runtime.InteropServices.PInvoke, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Runtime.InteropServices.DefaultParameterValueAttribute"] = "System.Runtime.InteropServices.PInvoke, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.InteropServices.RuntimeInformation"] = "System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.InteropServices.Architecture"] = "System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Runtime.InteropServices.OSPlatform"] = "System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1601,7 +1604,6 @@ namespace System.Management.Automation typeCatalog["System.Security.Claims.ClaimValueTypes"] = "System.Security.Claims, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.Aes"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.DeriveBytes"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Security.Cryptography.DSAParameters"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.ECDsa"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.MD5"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.SHA1"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1623,6 +1625,7 @@ namespace System.Management.Automation typeCatalog["System.Security.Cryptography.RSASignaturePadding"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.RSASignaturePaddingMode"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.TripleDES"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Security.Cryptography.RSAImplementation+RSAOpenSsl"] = "System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.AsnEncodedData"] = "System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.Oid"] = "System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Security.Cryptography.OidCollection"] = "System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; @@ -1699,25 +1702,25 @@ namespace System.Management.Automation typeCatalog["System.ServiceProcess.ServiceStartMode"] = "System.ServiceProcess.ServiceController, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.ServiceProcess.ServiceType"] = "System.ServiceProcess.ServiceController, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.ServiceProcess.TimeoutException"] = "System.ServiceProcess.ServiceController, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.Regex"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.MatchEvaluator"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.Capture"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.CaptureCollection"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.Group"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.GroupCollection"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.Match"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.MatchCollection"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.RegexMatchTimeoutException"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Text.RegularExpressions.RegexOptions"] = "System.Text.RegularExpressions, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.Regex"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.MatchEvaluator"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.Capture"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.CaptureCollection"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.Group"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.GroupCollection"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.Match"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.MatchCollection"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.RegexMatchTimeoutException"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Text.RegularExpressions.RegexOptions"] = "System.Text.RegularExpressions, Version=4.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.BarrierPostPhaseException"] = "System.Threading, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.Barrier"] = "System.Threading, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.LockRecursionPolicy"] = "System.Threading, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.ReaderWriterLockSlim"] = "System.Threading, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.Tasks.TaskExtensions"] = "System.Threading.Tasks, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Threading.Tasks.ValueTask`1"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.CompilerServices.ValueTaskAwaiter`1"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - typeCatalog["System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1+ConfiguredValueTaskAwaiter"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + typeCatalog["System.Threading.Tasks.ValueTask`1"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"; + typeCatalog["System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"; + typeCatalog["System.Runtime.CompilerServices.ValueTaskAwaiter`1"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"; + typeCatalog["System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1+ConfiguredValueTaskAwaiter"] = "System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"; typeCatalog["System.Threading.Tasks.ParallelOptions"] = "System.Threading.Tasks.Parallel, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.Tasks.Parallel"] = "System.Threading.Tasks.Parallel, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; typeCatalog["System.Threading.Tasks.ParallelLoopState"] = "System.Threading.Tasks.Parallel, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index cb381aa281..3eb4d83f3c 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -17,8 +17,8 @@ "define": [ "CORECLR" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23729", - "System.Runtime.Loader": "4.0.0-rc3-23729" + "NETStandard.Library": "1.0.0-rc3-23817", + "System.Runtime.Loader": "4.0.0-rc3-23817" } } }, diff --git a/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs b/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs new file mode 100644 index 0000000000..dd02d48341 --- /dev/null +++ b/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs @@ -0,0 +1,2 @@ +using System.Runtime.CompilerServices; +[assembly:InternalsVisibleTo("powershell-tests")] diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index 1230eb8681..9f2ea741fc 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -14,10 +14,6 @@ "type": "build", "version": "1.0.0-*" }, - "Microsoft.PowerShell.Commands.Omi": { - "type": "build", - "version": "1.0.0-*" - }, "Microsoft.PowerShell.Commands.Utility": { "type": "build", "version": "1.0.0-*" diff --git a/src/System.Management.Automation/AssemblyInfo.cs b/src/System.Management.Automation/AssemblyInfo.cs index d4fecd7d37..34137476a5 100644 --- a/src/System.Management.Automation/AssemblyInfo.cs +++ b/src/System.Management.Automation/AssemblyInfo.cs @@ -8,6 +8,7 @@ using System.Reflection; [assembly:InternalsVisibleTo("Microsoft.PowerShell.Security")] [assembly:InternalsVisibleTo("Microsoft.PowerShell.CoreCLR.AssemblyLoadContext")] [assembly:InternalsVisibleTo("powershell")] +[assembly:InternalsVisibleTo("powershell-tests")] [assembly:AssemblyFileVersionAttribute("3.0.0.0")] [assembly:AssemblyVersion("3.0.0.0")] diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index e3c88b374c..f4fdc9eb0b 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -29,33 +29,33 @@ "define": [ "CORECLR", "NOETW" ] }, "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-23729", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23729", - "System.Collections.Specialized": "4.0.1-rc3-23729", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23729", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23729", - "System.Data.Common": "4.0.1-rc3-23729", - "System.Diagnostics.Contracts": "4.0.1-rc3-23729", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23729", - "System.Diagnostics.Process": "4.1.0-rc3-23729", - "System.Diagnostics.StackTrace": "4.0.1-rc3-23729", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23729", - "System.Dynamic.Runtime": "4.0.11-rc3-23729", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23729", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23729", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23729", - "System.IO.Pipes": "4.0.0-rc3-23729", - "System.Linq.Expressions": "4.0.11-rc3-23729", - "System.Net.Http": "4.0.1-rc3-23729", - "System.Net.NetworkInformation": "4.1.0-rc3-23729", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23729", - "System.Security.AccessControl": "4.0.0-rc3-23729", - "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23729", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23729", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23729", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23729", - "System.Xml.XmlDocument": "4.0.1-rc3-23729", - "System.Xml.XmlSerializer": "4.0.11-rc3-23729", + "Microsoft.CSharp": "4.0.1-rc3-23817", + "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23817", + "System.Collections.Specialized": "4.0.1-rc3-23817", + "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23817", + "System.ComponentModel.TypeConverter": "4.0.1-rc3-23817", + "System.Data.Common": "4.0.1-rc3-23817", + "System.Diagnostics.Contracts": "4.0.1-rc3-23817", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23817", + "System.Diagnostics.Process": "4.1.0-rc3-23817", + "System.Diagnostics.StackTrace": "4.0.1-rc3-23817", + "System.Diagnostics.TraceSource": "4.0.0-rc3-23817", + "System.Dynamic.Runtime": "4.0.11-rc3-23817", + "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23817", + "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23817", + "System.IO.FileSystem.Watcher": "4.0.0-rc3-23817", + "System.IO.Pipes": "4.0.0-rc3-23817", + "System.Linq.Expressions": "4.0.11-rc3-23817", + "System.Net.Http": "4.0.1-rc3-23817", + "System.Net.NetworkInformation": "4.1.0-rc3-23817", + "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23817", + "System.Security.AccessControl": "4.0.0-rc3-23817", + "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23817", + "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23817", + "System.Threading.Tasks.Parallel": "4.0.1-rc3-23817", + "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23817", + "System.Xml.XmlDocument": "4.0.1-rc3-23817", + "System.Xml.XmlSerializer": "4.0.11-rc3-23817", "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": { "type": "build", "version": "1.0.0-*" diff --git a/src/System.Security.SecureString/project.json b/src/System.Security.SecureString/project.json index 6907ce6362..b896a5f216 100644 --- a/src/System.Security.SecureString/project.json +++ b/src/System.Security.SecureString/project.json @@ -6,7 +6,7 @@ "compilationOptions": { "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23729" + "NETStandard.Library": "1.0.0-rc3-23817" }, "frameworks": { "dnxcore50": { } } diff --git a/src/TypeCatalogGen/Runtime/project.json b/src/TypeCatalogGen/Runtime/project.json index e792cb23f5..90a960e66d 100644 --- a/src/TypeCatalogGen/Runtime/project.json +++ b/src/TypeCatalogGen/Runtime/project.json @@ -4,36 +4,36 @@ "authors": [ "andschwa" ], "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23729", + "NETStandard.Library": "1.0.0-rc3-23817", - "Microsoft.CSharp": "4.0.1-rc3-23729", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23729", - "System.Collections.Specialized": "4.0.1-rc3-23729", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23729", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23729", - "System.Data.Common": "4.0.1-rc3-23729", - "System.Diagnostics.Contracts": "4.0.1-rc3-23729", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23729", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23729", - "System.Dynamic.Runtime": "4.0.11-rc3-23729", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23729", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23729", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23729", - "System.IO.Pipes": "4.0.0-rc3-23729", - "System.Linq.Expressions": "4.0.11-rc3-23729", - "System.Net.Http": "4.0.1-rc3-23729", - "System.Net.NetworkInformation": "4.1.0-rc3-23729", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23729", - "System.Security.AccessControl": "4.0.0-rc3-23729", - "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23729", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23729", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23729", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23729", - "System.Xml.XmlDocument": "4.0.1-rc3-23729", - "System.Xml.XmlSerializer": "4.0.11-rc3-23729", + "Microsoft.CSharp": "4.0.1-rc3-23817", + "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23817", + "System.Collections.Specialized": "4.0.1-rc3-23817", + "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23817", + "System.ComponentModel.TypeConverter": "4.0.1-rc3-23817", + "System.Data.Common": "4.0.1-rc3-23817", + "System.Diagnostics.Contracts": "4.0.1-rc3-23817", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23817", + "System.Diagnostics.TraceSource": "4.0.0-rc3-23817", + "System.Dynamic.Runtime": "4.0.11-rc3-23817", + "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23817", + "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23817", + "System.IO.FileSystem.Watcher": "4.0.0-rc3-23817", + "System.IO.Pipes": "4.0.0-rc3-23817", + "System.Linq.Expressions": "4.0.11-rc3-23817", + "System.Net.Http": "4.0.1-rc3-23817", + "System.Net.NetworkInformation": "4.1.0-rc3-23817", + "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23817", + "System.Security.AccessControl": "4.0.0-rc3-23817", + "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23817", + "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23817", + "System.Threading.Tasks.Parallel": "4.0.1-rc3-23817", + "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23817", + "System.Xml.XmlDocument": "4.0.1-rc3-23817", + "System.Xml.XmlSerializer": "4.0.11-rc3-23817", - "System.ServiceProcess.ServiceController": "4.1.0-rc3-23729", - "System.Net.NameResolution": "4.0.0-rc3-23729" + "System.ServiceProcess.ServiceController": "4.1.0-rc3-23817", + "System.Net.NameResolution": "4.0.0-rc3-23817" }, "frameworks": { "dnxcore50": { } } diff --git a/src/monad b/src/monad index bbd1d96e95..b0a0d11a58 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit bbd1d96e95c9ab66dee55758a2566746c62fb568 +Subproject commit b0a0d11a58f9737da7963bfda46954615261be1d diff --git a/test/csharp/MyHost.cs b/test/csharp/MyHost.cs deleted file mode 100644 index 59cbd41c34..0000000000 --- a/test/csharp/MyHost.cs +++ /dev/null @@ -1,166 +0,0 @@ -namespace PSTests -{ - using System; - using System.Globalization; - using System.Management.Automation.Host; - - /// - /// This is a sample implementation of the PSHost abstract class for - /// console applications. Not all members are implemented. Those that - /// are not implemented throw a NotImplementedException exception or - /// return nothing. - /// - internal class MyHost : PSHost - { - /// - /// A reference to the PSHost implementation. - /// - private RunspaceTests program; - - /// - /// The culture information of the thread that created - /// this object. - /// - private CultureInfo originalCultureInfo = - CultureInfo.CurrentCulture; - // System.Threading.Thread.CurrentThread.CurrentCulture; - - /// - /// The UI culture information of the thread that created - /// this object. - /// - private CultureInfo originalUICultureInfo = - CultureInfo.CurrentCulture; - // System.Threading.Thread.CurrentThread.CurrentUICulture; - - /// - /// The identifier of this PSHost implementation. - /// - private Guid myId = Guid.NewGuid(); - - /// - /// Initializes a new instance of the MyHost class. Keep - /// a reference to the host application object so that it - /// can be informed of when to exit. - /// - /// - /// A reference to the host application object. - /// - public MyHost(RunspaceTests program) - { - this.program = program; - } - - /// - /// Return the culture information to use. This implementation - /// returns a snapshot of the culture information of the thread - /// that created this object. - /// - public override System.Globalization.CultureInfo CurrentCulture - { - get { return this.originalCultureInfo; } - } - - /// - /// Return the UI culture information to use. This implementation - /// returns a snapshot of the UI culture information of the thread - /// that created this object. - /// - public override System.Globalization.CultureInfo CurrentUICulture - { - get { return this.originalUICultureInfo; } - } - - /// - /// This implementation always returns the GUID allocated at - /// instantiation time. - /// - public override Guid InstanceId - { - get { return this.myId; } - } - - /// - /// Return a string that contains the name of the host implementation. - /// Keep in mind that this string may be used by script writers to - /// identify when your host is being used. - /// - public override string Name - { - get { return "MySampleConsoleHostImplementation"; } - } - - /// - /// This sample does not implement a PSHostUserInterface component so - /// this property simply returns null. - /// - public override PSHostUserInterface UI - { - get { return null; } - } - - /// - /// Return the version object for this application. Typically this - /// should match the version resource in the application. - /// - public override Version Version - { - get { return new Version(1, 0, 0, 0); } - } - - /// - /// Not implemented by this example class. The call fails with - /// a NotImplementedException exception. - /// - public override void EnterNestedPrompt() - { - throw new NotImplementedException( - "The method or operation is not implemented."); - } - - /// - /// Not implemented by this example class. The call fails - /// with a NotImplementedException exception. - /// - public override void ExitNestedPrompt() - { - throw new NotImplementedException( - "The method or operation is not implemented."); - } - - /// - /// This API is called before an external application process is - /// started. Typically it is used to save state so the parent can - /// restore state that has been modified by a child process (after - /// the child exits). In this example, this functionality is not - /// needed so the method returns nothing. - /// - public override void NotifyBeginApplication() - { - return; - } - - /// - /// This API is called after an external application process finishes. - /// Typically it is used to restore state that a child process may - /// have altered. In this example, this functionality is not - /// needed so the method returns nothing. - /// - public override void NotifyEndApplication() - { - return; - } - - /// - /// Indicate to the host application that exit has - /// been requested. Pass the exit code that the host - /// application should use when exiting the process. - /// - /// The exit code to use. - public override void SetShouldExit(int exitCode) - { - // this.program.ShouldExit = true; - // this.program.ExitCode = exitCode; - } - } -} diff --git a/test/csharp/project.json b/test/csharp/project.json index b2a8d406dc..ec0f0c699d 100644 --- a/test/csharp/project.json +++ b/test/csharp/project.json @@ -1,15 +1,22 @@ { + "name": "powershell-tests", "version": "1.0.0-*", - "description": "INCOMPLETE: PowerShell On Linux xUnit Tests", + "description": "PowerShell On Linux xUnit Tests", "authors": [ "andschwa" ], - "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23729", - "Microsoft.PowerShell.Linux.Host": { - "type": "build", - "version": "1.0.0-*" - }, + "frameworks": { + "dnxcore50": { + "dependencies": { + "Microsoft.PowerShell.Linux.Host": { + "type": "build", + "version": "1.0.0-*" + }, + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-*" + }, + "imports": "portable-net45+win8" + } }, - "frameworks": { "dnxcore50": { "imports": "portable-net45+win8" } } + "testRunner": "xunit" } diff --git a/test/csharp/test_OmiInterface.cs b/test/csharp/test_OmiInterface.cs deleted file mode 100644 index d95b0a320c..0000000000 --- a/test/csharp/test_OmiInterface.cs +++ /dev/null @@ -1,71 +0,0 @@ -using Xunit; -using System; -using System.Management.Automation; -using System.Diagnostics; -using System.Collections.Generic; -using System.Linq; -using System.Xml.Linq; - -namespace PSTests -{ - public static class OmiInterfaceTests - { - [Fact] - public static void TestHostName() - { - const string ns = "root/omi"; - const string cn = "OMI_Identify"; - const string property = "SystemName"; - - string expected = null; - - var startInfo = new ProcessStartInfo - { - FileName = @"/usr/bin/env", - Arguments = "hostname", - RedirectStandardOutput = true, - UseShellExecute = false - }; - using (Process process = Process.Start(startInfo)) - { - // Get output of call to hostname without trailing newline - expected = process.StandardOutput.ReadToEnd().Trim(); - process.WaitForExit(); - - // The process should return an exit code of 0 on success - Assert.Equal(0, process.ExitCode); - } - - string value = null; - OmiInterface oi = new OmiInterface(); - oi.GetOmiValue(ns, cn, property, out value); - Assert.Equal(expected, value); - } - - [Fact] - public static void TestXHugeNumberEnumerable() - { - const string ns = "interop"; - const string cn = "X_HugeNumber"; - - OmiInterface oi = new OmiInterface(); - IEnumerable elements; - oi.GetOmiValues(ns, cn, out elements); - Assert.True(elements.FirstOrDefault() != null); - } - - [Fact] - public static void TestXHugeNumberOmiData() - { - const string ns = "interop"; - const string cn = "X_HugeNumber"; - - OmiInterface oi = new OmiInterface(); - - OmiData data; - oi.GetOmiValues(ns, cn, out data); - Assert.True(data != null); - Assert.Equal(data.Values.Count(), 22); - } - } -} diff --git a/test/csharp/test_Runspace.cs b/test/csharp/test_Runspace.cs index 70335af0f7..96dbe6355f 100644 --- a/test/csharp/test_Runspace.cs +++ b/test/csharp/test_Runspace.cs @@ -2,6 +2,7 @@ using Xunit; using System; using System.Management.Automation; using System.Management.Automation.Runspaces; +using Microsoft.PowerShell.Linux.Host; namespace PSTests { @@ -13,6 +14,12 @@ namespace PSTests private static int count = 3; private static string script = String.Format($"get-process | select-object -first {count}"); + // Initialize the Core PowerShell AssemblyLoadContext + public RunspaceTests() + { + PowerShellAssemblyLoadContextInitializer.SetPowerShellAssemblyLoadContext(AppContext.BaseDirectory); + } + [Fact] public void TestRunspaceWithPipeline() { @@ -64,7 +71,8 @@ namespace PSTests [Fact] public void TestRunspaceWithPowerShellAndHost() { - MyHost myHost = new MyHost(this); + Listener listener = new Listener("", false); + MyHost myHost = new MyHost(listener); using (var runspace = RunspaceFactory.CreateRunspace(myHost)) { runspace.Open(); @@ -91,7 +99,8 @@ namespace PSTests [Fact] public void TestRunspaceWithFunction() { - MyHost myHost = new MyHost(this); + Listener listener = new Listener("", false); + MyHost myHost = new MyHost(listener); using (var runspace = RunspaceFactory.CreateRunspace(myHost)) { runspace.Open(); diff --git a/xunit.sh b/xunit.sh new file mode 100755 index 0000000000..57330555fc --- /dev/null +++ b/xunit.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# Build native components +pushd src/libpsl-native +cmake -DCMAKE_BUILD_TYPE=Debug . +make -j +ctest -V +## Work-around dotnet/cli#710 +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/src" +popd + +# Run xUnit tests +pushd test/csharp +## Build +dotnet build +## Work-around dotnet/cli#753 +cp -r ../../src/Microsoft.PowerShell.Linux.Host/{Modules,*ps1xml} bin/Debug/dnxcore50/ +## Test +dotnet test +popd