From d16cfbd04f44541f08d1d089236aff473c655bd4 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 14 Jun 2016 16:05:54 -0700 Subject: [PATCH] Work-around dotnet bug The include must be duplicated because the root `buildOptions` is not being applied "whenever compiling the project." --- .../project.json | 13 ++++++++----- .../project.json | 11 +++++++---- src/Microsoft.PowerShell.Security/project.json | 11 +++++++---- src/System.Management.Automation/project.json | 12 ++++++++---- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 6687363bb..8ceb0ff97 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -5,10 +5,7 @@ "buildOptions": { "warningsAsErrors": true, - "allowUnsafe": true, - "compile": { - "include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ] - } + "allowUnsafe": true }, "dependencies": { @@ -21,6 +18,7 @@ "buildOptions": { "define": [ "CORECLR" ], "compile": { + "include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ], "exclude": [ "commands/management/ClearRecycleBinCommand.cs", "commands/management/CommitTransactionCommand.cs", @@ -50,6 +48,11 @@ } }, "net451": { + "buildOptions": { + "compile": { + "include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ] + } + }, "frameworkAssemblies": { "System.ServiceProcess": "", "System.Windows.Forms": "", @@ -57,7 +60,7 @@ "System.Web.Services": "" }, "dependencies": { - "Microsoft.WSMan.Management": "1.0.0" + "Microsoft.WSMan.Management": "1.0.0" } } } diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index 4f05131e9..2fb1899e6 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -5,10 +5,7 @@ "buildOptions": { "warningsAsErrors": true, - "allowUnsafe": true, - "compile": { - "include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ] - } + "allowUnsafe": true }, "dependencies": { @@ -20,6 +17,7 @@ "buildOptions": { "define": [ "CORECLR" ], "compile": { + "include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ], "exclude": [ "commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs", "commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs", @@ -67,6 +65,11 @@ } }, "net451": { + "buildOptions": { + "compile": { + "include": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ] + } + }, "frameworkAssemblies": { "System.Drawing": "", "System.Web": "", diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json index 0aa08368f..28d548fed 100644 --- a/src/Microsoft.PowerShell.Security/project.json +++ b/src/Microsoft.PowerShell.Security/project.json @@ -5,10 +5,7 @@ "buildOptions": { "warningsAsErrors": true, - "allowUnsafe": true, - "compile": { - "include": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ] - } + "allowUnsafe": true }, "dependencies": { @@ -21,6 +18,7 @@ "buildOptions": { "define": [ "CORECLR" ], "compile": { + "include": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ], "exclude": [ "security/CertificateCommands.cs", "security/CmsCommands.cs", @@ -30,6 +28,11 @@ } }, "net451": { + "buildOptions": { + "compile": { + "include": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ] + } + } } } } diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 035187b6f..d76b0e9b5 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -5,10 +5,7 @@ "buildOptions": { "warningsAsErrors": true, - "allowUnsafe": true, - "compile": { - "include": [ "../windows-build/gen/System.Management.Automation/*.cs" ] - } + "allowUnsafe": true }, "configurations": { @@ -29,6 +26,7 @@ "buildOptions": { "define": [ "CORECLR" ], "compile": { + "include": [ "../windows-build/gen/System.Management.Automation/*.cs" ], "exclude": [ "cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs", "cimSupport/cmdletization/xml/cmdlets-over-objects.xmlSerializer.autogen.cs", @@ -165,6 +163,12 @@ } }, "net451": { + "buildOptions": { + "compile": { + "include": [ "../windows-build/gen/System.Management.Automation/*.cs" ] + + } + }, "frameworkAssemblies": { "System.Runtime": "", "System.Xml": "",