From e125650e5456693181fbc7efadad02adc28019d8 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 26 Jan 2016 16:43:02 -0800 Subject: [PATCH] Update mapped compileFiles Removed CorePsPlatform.cs from the build mapping so that I could perform it before merging. Note that SMA by default now builds with a bunch of tracing files for ETW, which cannot be compiled on Linux and must be hand-removed from the windows-build auto-generated compileFiles output. --- .../project.json | 5 +++++ src/System.Management.Automation/project.json | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index 0ecd13b12..41766bcf4 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -26,10 +26,13 @@ "compileFiles": [ "../monad/monad/src/commands/utility/AddMember.cs", + "../monad/monad/src/commands/utility/AddType.cs", "../monad/monad/src/commands/utility/CSVCommands.cs", "../monad/monad/src/commands/utility/ConsoleColorCmdlet.cs", "../monad/monad/src/commands/utility/ConvertFrom-StringData.cs", "../monad/monad/src/commands/utility/Csv.cs", + "../monad/monad/src/commands/utility/CustomSerialization.cs", + "../monad/monad/src/commands/utility/CustomSerializationStrings.cs", "../monad/monad/src/commands/utility/DebugRunspaceCommand.cs", "../monad/monad/src/commands/utility/Disable-PSBreakpoint.cs", "../monad/monad/src/commands/utility/Enable-PSBreakpoint.cs", @@ -86,6 +89,7 @@ "../monad/monad/src/commands/utility/WriteAliasCommandBase.cs", "../monad/monad/src/commands/utility/WriteConsoleCmdlet.cs", "../monad/monad/src/commands/utility/WriteProgressCmdlet.cs", + "../monad/monad/src/commands/utility/XmlCommands.cs", "../monad/monad/src/commands/utility/compare-object.cs", "../monad/monad/src/commands/utility/group-object.cs", "../monad/monad/src/commands/utility/new-object.cs", @@ -116,6 +120,7 @@ "UpdateDataStrings": "../windows-build/gen/COMMANDS_UTILITY/UpdateDataStrings.resources", "UtilityCommonStrings": "../windows-build/gen/COMMANDS_UTILITY/UtilityCommonStrings.resources", "VariableCommandStrings": "../windows-build/gen/COMMANDS_UTILITY/VariableCommandStrings.resources", + "WebCmdletStrings": "../windows-build/gen/COMMANDS_UTILITY/WebCmdletStrings.resources", "WriteErrorStrings": "../windows-build/gen/COMMANDS_UTILITY/WriteErrorStrings.resources", "WriteProgressResourceStrings": "../windows-build/gen/COMMANDS_UTILITY/WriteProgressResourceStrings.resources" } diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index eba27a796..02002ef4f 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -52,11 +52,13 @@ "frameworks": { "dnxcore50": { } }, - "compile" : [ "../windows-build/gen/SYS_AUTO/*.cs" ], + "compile" : [ + "../windows-build/gen/SYS_AUTO/*.cs", + "../monad/monad/src/CoreCLR/CorePsPlatform.cs" + ], "compileFiles": [ "../monad/monad/src/CoreCLR/CorePsExtensions.cs", - "../monad/monad/src/CoreCLR/CorePsPlatform.cs", "../monad/monad/src/CoreCLR/CorePsStub.cs", "../monad/monad/src/DscSupport/CimDSCParser.cs", "../monad/monad/src/cimSupport/cmdletization/EnumWriter.cs", @@ -76,6 +78,17 @@ "../monad/monad/src/commands/utility/FormatAndOutput/common/BaseOutputtingCommand.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/ColumnWidthManager.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/ComplexWriter.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/Certificate_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/Diagnostics_Format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/DotNetTypes_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/Event_Format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/FileSystem_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/HelpV3_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/Help_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/PowerShellCore_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/PowerShellTrace_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/Registry_format_ps1xml.cs", + "../monad/monad/src/commands/utility/FormatAndOutput/common/DefaultFormatters/WSMan_Format_ps1xml.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/DisplayDatabase/FormatTable.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs", "../monad/monad/src/commands/utility/FormatAndOutput/common/DisplayDatabase/commands.cs",