diff --git a/README.md b/README.md index 10b1a7072dc..863c9ada047 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ | |Ubuntu 14.04 |Windows | |---------|:------:|:------:| |master| TODO |[![Build status](https://ci.appveyor.com/api/projects/status/wb0a0apbn4aiccp1/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/powershell-linux/branch/master)| +|dnx451| TODO |[![Build status](https://ci.appveyor.com/api/projects/status/wb0a0apbn4aiccp1/branch/dnx451?svg=true)](https://ci.appveyor.com/project/PowerShell/powershell-linux/branch/dnx451)| ## Obtain the source code diff --git a/build.ps1 b/build.ps1 index 9d41a26cade..12594bcf1ed 100755 --- a/build.ps1 +++ b/build.ps1 @@ -10,7 +10,7 @@ cd ../.. # Publish PowerShell cd src/Microsoft.PowerShell.Linux.Host -dotnet publish --framework dnxcore50 --output $BIN +dotnet publish --framework dnx451 --output $BIN # Copy files that dotnet-publish does not currently deploy cp *_profile.ps1 $BIN cd ../.. diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index 0f48b8cf950..21974952fdd 100644 --- a/src/Microsoft.Management.Infrastructure.Native/project.json +++ b/src/Microsoft.Management.Infrastructure.Native/project.json @@ -6,12 +6,8 @@ "compilationOptions": { "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - "System.Security.SecureString": { - "type": "build", - "version": "1.0.0-*" - } }, - "frameworks": { "dnxcore50": { } } + "dnx451": {}, +"frameworks": { "dnx451": { } } } diff --git a/src/Microsoft.Management.Infrastructure/project.json b/src/Microsoft.Management.Infrastructure/project.json index 397ecebbd6f..445f1fc0bbf 100644 --- a/src/Microsoft.Management.Infrastructure/project.json +++ b/src/Microsoft.Management.Infrastructure/project.json @@ -12,20 +12,16 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - "System.Runtime.Serialization.Xml": "4.1.0-rc2-23712", - "System.Threading.ThreadPool": "4.0.10-rc2-23712", + "Microsoft.Management.Infrastructure.Native" : { "type": "build", "version": "1.0.0-*" - }, - "System.Security.SecureString": { - "type": "build", - "version": "1.0.0-*" } + }, - "frameworks": { "dnxcore50": { } }, + "dnx451": {}, +"frameworks": { "dnx451": { } }, "compileFiles": [ "../monad/wmi/WMIv2/Client/DotNetAPI/cs/AssemblyInfo.cs", diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index c889df9dcc5..d68679408ba 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -5,24 +5,24 @@ "compilationOptions": { "define": [ - "CORECLR", - "_CORECLR", - "LINUX" + ], "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - "System.ServiceProcess.ServiceController": "4.1.0-rc2-23712", - "System.Net.NameResolution": "4.0.0-rc2-23712", - "Microsoft.PowerShell.Security": { - "type": "build", - "version": "1.0.0-*" - } + "Microsoft.PowerShell.Security": { + "type": "build", + "version": "1.0.0-*" + }, }, - "frameworks": { "dnxcore50": { } }, + "dnx451": {}, + "frameworks": { "dnx451": { + "frameworkAssemblies": { + "System.ServiceProcess": "4.0.0.0", + }, + } }, "compile": [ "../windows-build/gen/COMMANDS_MANAGEMENT/*.cs" ], @@ -55,7 +55,6 @@ "../monad/monad/src/commands/management/ClearPropertyCommand.cs", "../monad/monad/src/commands/management/CombinePathCommand.cs", "../monad/monad/src/commands/management/CommandsCommon.cs", - "../monad/monad/src/commands/management/Computer.cs", "../monad/monad/src/commands/management/ContentCommandBase.cs", "../monad/monad/src/commands/management/ConvertPathCommand.cs", "../monad/monad/src/commands/management/CopyPropertyCommand.cs", @@ -77,7 +76,9 @@ "../monad/monad/src/commands/management/Service.cs", "../monad/monad/src/commands/management/SetContentCommand.cs", "../monad/monad/src/commands/management/SetPropertyCommand.cs", - "../monad/monad/src/commands/management/WriteContentCommandBase.cs" + "../monad/monad/src/commands/management/WriteContentCommandBase.cs", + + ], "namedResource": { diff --git a/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs b/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs index dcae1f4b172..2a2ca5f456c 100644 --- a/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs +++ b/src/Microsoft.PowerShell.Commands.Omi/OmiInterface.cs @@ -18,12 +18,22 @@ internal static class Platform { internal static bool IsLinux() { +#if CORECLR return RuntimeInformation.IsOSPlatform(OSPlatform.Linux); +#else + // FullCLR doesn't have a Linux version + return false; +#endif } internal static bool IsWindows() { +#if CORECLR return RuntimeInformation.IsOSPlatform(OSPlatform.Windows); +#else + // FullCLR has only Windows version + return true; +#endif } } diff --git a/src/Microsoft.PowerShell.Commands.Omi/project.json b/src/Microsoft.PowerShell.Commands.Omi/project.json index 0ff79a3581b..4f2ad5265cc 100644 --- a/src/Microsoft.PowerShell.Commands.Omi/project.json +++ b/src/Microsoft.PowerShell.Commands.Omi/project.json @@ -4,14 +4,12 @@ "authors": [ "George Fleming", "andschwa" ], "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - "System.Xml.XDocument": "4.0.11-rc2-23712", - "System.Runtime.InteropServices": "4.0.21-rc2-23712", "System.Management.Automation": { "type": "build", "version": "1.0.0-*" } }, - "frameworks": { "dnxcore50": { } } + "dnx451": {}, + "frameworks": { "dnx451": { } } } diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index a55ea90904e..75139d8d7ad 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -5,22 +5,19 @@ "compilationOptions": { "define": [ - "CORECLR", - "_CORECLR", - "LINUX" ], "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", "System.Management.Automation": { "type": "build", "version": "1.0.0-*" } }, - "frameworks": { "dnxcore50": { } }, + "dnx451": {}, +"frameworks": { "dnx451": { } }, "compile": [ "../windows-build/gen/COMMANDS_UTILITY/*.cs" ], diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index bc250450d92..f38221737db 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -8,9 +8,8 @@ "compilationOptions": { "define": [ "CORECLR", "LINUX" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - "System.Runtime.Loader": "4.0.0-rc2-23712" }, - "frameworks": { "dnxcore50": { } } + "dnx451": {}, +"frameworks": { "dnx451": { } } } diff --git a/src/Microsoft.PowerShell.Linux.Host/main.cs b/src/Microsoft.PowerShell.Linux.Host/main.cs index 564a194be98..48765acdf80 100644 --- a/src/Microsoft.PowerShell.Linux.Host/main.cs +++ b/src/Microsoft.PowerShell.Linux.Host/main.cs @@ -18,11 +18,14 @@ public static class Program /// public static void Main(string[] args) { +#if CORECLR // Setup the Assembly Load Context, which Core PowerShell uses to // analyze the libraries for types, functions, cmdlets, etc. and // provide the ability to load assemblies by file path. Doing this // here eliminates the need for a custom native host. + PowerShellAssemblyLoadContextInitializer.SetPowerShellAssemblyLoadContext(AppContext.BaseDirectory); +#endif // Custom argument parsing string initialScript = null; diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index 45344ce9951..8ec72d389d6 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -9,7 +9,6 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", "Newtonsoft.Json": "8.0.2", "Microsoft.PowerShell.Commands.Management": { "type": "build", @@ -25,5 +24,6 @@ } }, - "frameworks": { "dnxcore50": { } } + "dnx451": {}, +"frameworks": { "dnx451": { } } } diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json index c4d044d78c5..e7bffb6547a 100644 --- a/src/Microsoft.PowerShell.Security/project.json +++ b/src/Microsoft.PowerShell.Security/project.json @@ -5,22 +5,20 @@ "compilationOptions": { "define": [ - "CORECLR", - "_CORECLR", - "LINUX" + ], "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", "System.Management.Automation": { "type": "build", "version": "1.0.0-*" } }, - "frameworks": { "dnxcore50": { } }, + "dnx451": {}, +"frameworks": { "dnx451": { } }, "compile": [ "../windows-build/gen/SECURITY/*.cs" ], diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 4cd72d35b89..9417ad9b519 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -6,51 +6,38 @@ "compilationOptions": { "define": [ - "CORECLR", - "_CORECLR", - "LINUX" + ], "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - "Microsoft.CSharp": "4.0.1-rc2-23712", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc2-23712", - "System.Collections.Specialized": "4.0.1-rc2-23712", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc2-23712", - "System.ComponentModel.TypeConverter": "4.0.1-rc2-23712", - "System.Data.Common": "4.0.1-rc2-23712", - "System.Diagnostics.Contracts": "4.0.1-rc2-23712", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23712", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23712", - "System.Dynamic.Runtime": "4.0.11-rc2-23712", - "System.IO.FileSystem.AccessControl": "4.0.0-rc2-23712", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc2-23712", - "System.IO.FileSystem.Watcher": "4.0.0-rc2-23712", - "System.IO.Pipes": "4.0.0-rc2-23712", - "System.Linq.Expressions": "4.0.11-rc2-23712", - "System.Net.Http": "4.0.1-rc2-23712", - "System.Net.NetworkInformation": "4.1.0-rc2-23712", - "System.Reflection.Emit.Lightweight": "4.0.1-rc2-23712", - "System.Security.AccessControl": "4.0.0-rc2-23712", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23712", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc2-23712", - "System.Threading.Tasks.Parallel": "4.0.1-rc2-23712", - "System.Xml.XPath.XmlDocument": "4.0.1-rc2-23712", - "System.Xml.XmlDocument": "4.0.1-rc2-23712", - "System.Xml.XmlSerializer": "4.0.11-rc2-23712", + "Microsoft.Management.Infrastructure" : { "type": "build", "version": "1.0.0-*" - }, - "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": { - "type": "build", - "version": "1.0.0-*" } }, - "frameworks": { "dnxcore50": { } }, + "dnx451": { }, + +"frameworks": { "dnx451": { + "frameworkAssemblies": { + "System.Runtime": "", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0", + "System.Numerics": "4.0.0.0", + "System.Data": "4.0.0.0", + "System.DirectoryServices": "4.0.0.0", + "System.Security": "4.0.0.0", + "System.Transactions": "4.0.0.0", + "System.Runtime.Serialization": "4.0.0.0", + "System.Management": "4.0.0.0", + "System.Configuration": "4.0.0.0", + "System.Configuration.Install": "4.0.0.0", + }, + + } }, "compile" : [ "../windows-build/gen/SYS_AUTO/*.cs" ], @@ -67,8 +54,8 @@ "../monad/monad/src/cimSupport/cmdletization/QueryBuilder.cs", "../monad/monad/src/cimSupport/cmdletization/ScriptWriter.cs", "../monad/monad/src/cimSupport/cmdletization/cim/WildcardPatternToCimQueryParser.cs", - "../monad/monad/src/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.objectModel.autogen.cs", - "../monad/monad/src/cimSupport/cmdletization/xml/CoreCLR/cmdlets-over-objects.xmlSerializer.autogen.cs", + "../monad/monad/src/cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs", + "../monad/monad/src/cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs", "../monad/monad/src/cimSupport/other/ciminstancetypeadapter.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/BaseCommand.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/BaseFormattingCommand.cs", @@ -132,6 +119,66 @@ "../monad/monad/src/engine/COM/ComProperty.cs", "../monad/monad/src/engine/COM/ComTypeInfo.cs", "../monad/monad/src/engine/COM/ComUtil.cs", + + "../monad/monad/src/engine/ComInterop/ArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/BoolArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/BoundDispEvent.cs", + "../monad/monad/src/engine/ComInterop/CollectionExtensions.cs", + "../monad/monad/src/engine/ComInterop/ComBinder.cs", + "../monad/monad/src/engine/ComInterop/ComBinderHelpers.cs", + "../monad/monad/src/engine/ComInterop/ComClassMetaObject.cs", + "../monad/monad/src/engine/ComInterop/ComDispIds.cs", + "../monad/monad/src/engine/ComInterop/ComEventDesc.cs", + "../monad/monad/src/engine/ComInterop/ComEventSink.cs", + "../monad/monad/src/engine/ComInterop/ComEventSinkProxy.cs", + "../monad/monad/src/engine/ComInterop/ComEventSinksContainer.cs", + "../monad/monad/src/engine/ComInterop/ComFallbackMetaObject.cs", + "../monad/monad/src/engine/ComInterop/ComHresults.cs", + "../monad/monad/src/engine/ComInterop/ComInterop.cs", + "../monad/monad/src/engine/ComInterop/ComInvokeAction.cs", + "../monad/monad/src/engine/ComInterop/ComInvokeBinder.cs", + "../monad/monad/src/engine/ComInterop/ComMetaObject.cs", + "../monad/monad/src/engine/ComInterop/ComMethodDesc.cs", + "../monad/monad/src/engine/ComInterop/ComObject.cs", + "../monad/monad/src/engine/ComInterop/ComParamDesc.cs", + "../monad/monad/src/engine/ComInterop/ComRuntimeHelpers.cs", + "../monad/monad/src/engine/ComInterop/ComType.cs", + "../monad/monad/src/engine/ComInterop/ComTypeClassDesc.cs", + "../monad/monad/src/engine/ComInterop/ComTypeDesc.cs", + "../monad/monad/src/engine/ComInterop/ComTypeEnumDesc.cs", + "../monad/monad/src/engine/ComInterop/ComTypeLibDesc.cs", + "../monad/monad/src/engine/ComInterop/ComTypeLibInfo.cs", + "../monad/monad/src/engine/ComInterop/ComTypeLibMemberDesc.cs", + "../monad/monad/src/engine/ComInterop/ConversionArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/ConvertArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/ConvertibleArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/CurrencyArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/DateTimeArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/DispatchArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/DispCallable.cs", + "../monad/monad/src/engine/ComInterop/DispCallableMetaObject.cs", + "../monad/monad/src/engine/ComInterop/ErrorArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/Errors.cs", + "../monad/monad/src/engine/ComInterop/ExcepInfo.cs", + "../monad/monad/src/engine/ComInterop/Helpers.cs", + "../monad/monad/src/engine/ComInterop/IDispatchComObject.cs", + "../monad/monad/src/engine/ComInterop/IDispatchMetaObject.cs", + "../monad/monad/src/engine/ComInterop/IPseudoComObject.cs", + "../monad/monad/src/engine/ComInterop/NullArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/SimpleArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/SplatCallSite.cs", + "../monad/monad/src/engine/ComInterop/StringArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/TypeEnumMetaObject.cs", + "../monad/monad/src/engine/ComInterop/TypeLibInfoMetaObject.cs", + "../monad/monad/src/engine/ComInterop/TypeLibMetaObject.cs", + "../monad/monad/src/engine/ComInterop/TypeUtils.cs", + "../monad/monad/src/engine/ComInterop/UnknownArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/VarEnumSelector.cs", + "../monad/monad/src/engine/ComInterop/Variant.cs", + "../monad/monad/src/engine/ComInterop/VariantArgBuilder.cs", + "../monad/monad/src/engine/ComInterop/VariantArray.cs", + "../monad/monad/src/engine/ComInterop/VariantBuilder.cs", + "../monad/monad/src/engine/ChildrenCmdletProviderInterfaces.cs", "../monad/monad/src/engine/CmdletFamilyProviderInterfaces.cs", "../monad/monad/src/engine/CmdletInfo.cs", @@ -268,6 +315,10 @@ "../monad/monad/src/engine/SessionStateVariableAPIs.cs", "../monad/monad/src/engine/ShellVariable.cs", "../monad/monad/src/engine/SpecialVariables.cs", + + "../monad/monad/src/engine/TransactionManager.cs", + "../monad/monad/src/engine/TransactedString.cs", + "../monad/monad/src/engine/ThirdPartyAdapter.cs", "../monad/monad/src/engine/TypeMetadata.cs", "../monad/monad/src/engine/TypeTable.cs", @@ -310,7 +361,11 @@ "../monad/monad/src/engine/hostifaces/PowerShell.cs", "../monad/monad/src/engine/hostifaces/PowerShellProcessInstance.cs", "../monad/monad/src/engine/hostifaces/RunspaceInit.cs", - "../monad/monad/src/engine/hostifaces/RunspacePool.cs", + + "../monad/monad/src/engine/hostifaces/RunspaceInvoke.cs", + "../monad/monad/src/engine/hostifaces/NativeCultureResolver.cs", + + "../monad/monad/src/engine/hostifaces/RunspacePool.cs", "../monad/monad/src/engine/hostifaces/RunspacePoolInternal.cs", "../monad/monad/src/engine/hostifaces/internalHostuserInterfacesecurity.cs", "../monad/monad/src/engine/hostifaces/pipelinebase.cs", @@ -378,6 +433,15 @@ "../monad/monad/src/engine/parser/token.cs", "../monad/monad/src/engine/parser/tokenizer.cs", "../monad/monad/src/engine/pipeline.cs", + + "../monad/monad/src/engine/PSMI/Serialization/InternalMISerializer.cs", + "../monad/monad/src/engine/PSMI/Serialization/MISerializer.cs", + "../monad/monad/src/engine/PSMI/Serialization/PSMISerializer.cs", + "../monad/monad/src/engine/PSMI/Serialization/MITypeSerializationInfo.cs", + "../monad/monad/src/engine/PSMI/Serialization/KnownMITypes.cs", + "../monad/monad/src/engine/PSMI/PSPowerShellPipeline.cs", + "../monad/monad/src/engine/PSMI/PSNegotiationData.cs", + "../monad/monad/src/engine/regex.cs", "../monad/monad/src/engine/remoting/client/ClientMethodExecutor.cs", "../monad/monad/src/engine/remoting/client/ClientRemotePowerShell.cs", @@ -490,6 +554,12 @@ "../monad/monad/src/engine/scriptparameterbinder.cs", "../monad/monad/src/engine/scriptparameterbindercontroller.cs", "../monad/monad/src/engine/serialization.cs", + + "../monad/monad/src/engine/ExtraAdapter.cs", + "../monad/monad/src/engine/ManagementObjectAdapter.cs", + "../monad/monad/src/engine/CodeMethods.cs", + "../monad/monad/src/engine/MshObjectTypeDescriptor.cs", + "../monad/monad/src/help/AliasHelpInfo.cs", "../monad/monad/src/help/AliasHelpProvider.cs", "../monad/monad/src/help/BaseCommandHelpInfo.cs", @@ -541,6 +611,9 @@ "../monad/monad/src/logging/LogContext.cs", "../monad/monad/src/logging/LogProvider.cs", "../monad/monad/src/logging/MshLog.cs", + + "../monad/monad/src/logging/eventlog/EventLogLogProvider.cs", + "../monad/monad/src/minishell/api/FormatAndTypeDataHelper.cs", "../monad/monad/src/minishell/api/RunspaceConfiguration.cs", "../monad/monad/src/minishell/api/RunspaceConfigurationAttributeException.cs", @@ -580,6 +653,12 @@ "../monad/monad/src/namespaces/StackInfo.cs", "../monad/monad/src/namespaces/VariableProvider.cs", "../monad/monad/src/namespaces/Win32Native.cs", + + "../monad/monad/src/namespaces/TransactedRegistry.cs", + "../monad/monad/src/namespaces/TransactedRegistryKey.cs", + "../monad/monad/src/namespaces/SafeTransactionHandle.cs", + "../monad/monad/src/namespaces/TransactedRegistrySecurity.cs", + "../monad/monad/src/security/Authenticode.cs", "../monad/monad/src/security/CredentialParameter.cs", "../monad/monad/src/security/MshSignature.cs", @@ -587,11 +666,24 @@ "../monad/monad/src/security/SecurityManager.cs", "../monad/monad/src/security/SecuritySupport.cs", "../monad/monad/src/security/nativeMethods.cs", + + "../monad/monad/src/security/wldpNativeMethods.cs", + "../monad/monad/src/singleshell/config/MshConsoleInfo.cs", "../monad/monad/src/singleshell/config/MshConsoleLoadException.cs", "../monad/monad/src/singleshell/config/MshSnapinInfo.cs", "../monad/monad/src/singleshell/config/MshSnapinLoadException.cs", "../monad/monad/src/singleshell/config/RunspaceConfigForSingleShell.cs", + + "../monad/monad/src/singleshell/config/RegistryStringResourceIndirect.cs", + "../monad/monad/src/singleshell/commands/MshSnapInCommands.cs", + "../monad/monad/src/singleshell/commands/ConsoleCommands.cs", + "../monad/monad/src/singleshell/installer/MshInstaller.cs", + "../monad/monad/src/singleshell/installer/MshSnapinInstaller.cs", + "../monad/monad/src/singleshell/installer/MshCoreMshSnapin.cs", + "../monad/monad/src/singleshell/installer/CustomMshSnapin.cs", + "../monad/monad/src/singleshell/installer/MshSnapin.cs", + "../monad/monad/src/utils/ArchitectureSensitiveAttribute.cs", "../monad/monad/src/utils/ClrFacade.cs", "../monad/monad/src/utils/CommandDiscoveryExceptions.cs", @@ -629,7 +721,25 @@ "../monad/monad/src/utils/StringUtil.cs", "../monad/monad/src/utils/StructuredTraceSource.cs", "../monad/monad/src/utils/Verbs.cs", - "../monad/monad/src/utils/assert.cs" + "../monad/monad/src/utils/assert.cs", + + "../monad/monad/src/utils/tracing/EtwActivity.cs", + "../monad/monad/src/utils/tracing/EtwActivityReverter.cs", + "../monad/monad/src/utils/tracing/EtwActivityReverterMethodInvoker.cs", + "../monad/monad/src/utils/tracing/EtwEventCorrelator.cs", + "../monad/monad/src/utils/tracing/IMethodInvoker.cs", + "../monad/monad/src/utils/tracing/PSEtwLog.cs", + "../monad/monad/src/utils/tracing/PSEtwLogProvider.cs", + "../monad/monad/src/utils/tracing/TracingGen.cs", + "../monad/monad/src/utils/tracing/Tracing.cs", + "../monad/monad/src/utils/PowerShellETWTracer.cs", + + "../monad/monad/src/utils/BackgroundDispatcher.cs", + "../monad/monad/src/utils/GraphicalHostReflectionWrapper.cs", + "../monad/monad/src/utils/WindowsErrorReporting.cs", + "../monad/monad/src/utils/perfCounters/CounterSetInstanceBase.cs", + "../monad/monad/src/utils/perfCounters/CounterSetRegistrarBase.cs", + "../monad/monad/src/utils/perfCounters/PSPerfCountersMgr.cs", ], "namedResource": { @@ -648,7 +758,8 @@ "DescriptionsStrings": "../windows-build/gen/SYS_AUTO/DescriptionsStrings.resources", "DiscoveryExceptions": "../windows-build/gen/SYS_AUTO/DiscoveryExceptions.resources", "EnumExpressionEvaluatorStrings": "../windows-build/gen/SYS_AUTO/EnumExpressionEvaluatorStrings.resources", - "ErrorCategoryStrings": "../windows-build/gen/SYS_AUTO/ErrorCategoryStrings.resources", + "EtwLoggingStrings": "../windows-build/gen/SYS_AUTO/EtwLoggingStrings.resources", + "ErrorCategoryStrings": "../windows-build/gen/SYS_AUTO/ErrorCategoryStrings.resources", "ErrorPackage": "../windows-build/gen/SYS_AUTO/ErrorPackage.resources", "EventingResources": "../windows-build/gen/SYS_AUTO/EventingResources.resources", "ExtendedTypeSystem": "../windows-build/gen/SYS_AUTO/ExtendedTypeSystem.resources", diff --git a/src/System.Security.SecureString/project.json b/src/System.Security.SecureString/project.json index 08da6a560aa..b5285929be8 100644 --- a/src/System.Security.SecureString/project.json +++ b/src/System.Security.SecureString/project.json @@ -6,8 +6,8 @@ "compilationOptions": { "allowUnsafe": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712" }, - "frameworks": { "dnxcore50": { } } + "dnx451": {}, +"frameworks": { "dnx451": { } } } diff --git a/src/TypeCatalogGen/Runtime/project.json b/src/TypeCatalogGen/Runtime/project.json index 92e10dee52d..d7eac546e6d 100644 --- a/src/TypeCatalogGen/Runtime/project.json +++ b/src/TypeCatalogGen/Runtime/project.json @@ -4,37 +4,9 @@ "authors": [ "andschwa" ], "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23712", - - "Microsoft.CSharp": "4.0.1-rc2-23712", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc2-23712", - "System.Collections.Specialized": "4.0.1-rc2-23712", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc2-23712", - "System.ComponentModel.TypeConverter": "4.0.1-rc2-23712", - "System.Data.Common": "4.0.1-rc2-23712", - "System.Diagnostics.Contracts": "4.0.1-rc2-23712", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23712", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23712", - "System.Dynamic.Runtime": "4.0.11-rc2-23712", - "System.IO.FileSystem.AccessControl": "4.0.0-rc2-23712", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc2-23712", - "System.IO.FileSystem.Watcher": "4.0.0-rc2-23712", - "System.IO.Pipes": "4.0.0-rc2-23712", - "System.Linq.Expressions": "4.0.11-rc2-23712", - "System.Net.Http": "4.0.1-rc2-23712", - "System.Net.NetworkInformation": "4.1.0-rc2-23712", - "System.Reflection.Emit.Lightweight": "4.0.1-rc2-23712", - "System.Security.AccessControl": "4.0.0-rc2-23712", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23712", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc2-23712", - "System.Threading.Tasks.Parallel": "4.0.1-rc2-23712", - "System.Xml.XPath.XmlDocument": "4.0.1-rc2-23712", - "System.Xml.XmlDocument": "4.0.1-rc2-23712", - "System.Xml.XmlSerializer": "4.0.11-rc2-23712", - - "System.ServiceProcess.ServiceController": "4.1.0-rc2-23712", - "System.Net.NameResolution": "4.0.0-rc2-23712" + }, - "frameworks": { "dnxcore50": { } } + "dnx451": {}, +"frameworks": { "dnx451": { } } } diff --git a/src/TypeCatalogGen/project.json b/src/TypeCatalogGen/project.json index aa02e09b044..5f95d33389e 100644 --- a/src/TypeCatalogGen/project.json +++ b/src/TypeCatalogGen/project.json @@ -8,8 +8,6 @@ }, "dependencies": { - "System.Reflection.Metadata": "1.1.1-beta-23516", - "System.Collections.Immutable": "1.1.38-beta-23516" }, "compileFiles": [ diff --git a/src/monad b/src/monad index 0f5ac90148f..aa10dd30208 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit 0f5ac90148f8fd0598aaadec7e8096daca8a6591 +Subproject commit aa10dd30208735d828d55faeff2759782cbfc5c4 diff --git a/src/windows-build b/src/windows-build index 6a5f3a9c1a2..9eb4d6ed520 160000 --- a/src/windows-build +++ b/src/windows-build @@ -1 +1 @@ -Subproject commit 6a5f3a9c1a2d69c9d3ac7454ca40ca3c924ccfcb +Subproject commit 9eb4d6ed52087255c504f23c26b1f8dc4415ef50