From c829d9e915517079aea01d822a02bc3aa727861d Mon Sep 17 00:00:00 2001 From: Adam Driscoll Date: Tue, 23 Aug 2016 12:38:25 -0500 Subject: [PATCH] Adding debugType portable to project.json. (#1959) * Adding debugType portable to project.json. * Move debugType. * Update project.json * Update project.json * Update project.json * Update project.json * Update project.json * Update project.json * Update project.json * Update project.json * Moving debugType into correct places. Removing from non-core builds. * Added missed files. * Fixing project.json debugType placement. --- .../project.json | 7 ++++--- .../project.json | 5 +++-- src/Microsoft.PackageManagement.CoreProviders/project.json | 3 ++- .../project.json | 5 +++-- src/Microsoft.PackageManagement.MsiProvider/project.json | 2 +- src/Microsoft.PackageManagement.MsuProvider/project.json | 2 +- src/Microsoft.PackageManagement.NuGetProvider/project.json | 3 ++- .../project.json | 1 + src/Microsoft.PackageManagement/project.json | 1 + src/Microsoft.PowerShell.Commands.Diagnostics/project.json | 1 + src/Microsoft.PowerShell.Commands.Management/project.json | 1 + src/Microsoft.PowerShell.Commands.Utility/project.json | 1 + src/Microsoft.PowerShell.ConsoleHost/project.json | 1 + .../project.json | 3 ++- src/Microsoft.PowerShell.CoreCLR.Eventing/project.json | 3 ++- src/Microsoft.PowerShell.LocalAccounts/project.json | 3 ++- src/Microsoft.PowerShell.PSReadLine/project.json | 3 ++- src/Microsoft.PowerShell.PackageManagement/project.json | 5 +++-- src/Microsoft.PowerShell.ScheduledJob/project.json | 2 +- src/Microsoft.PowerShell.Security/project.json | 1 + src/Microsoft.WSMan.Management/project.json | 1 + src/Microsoft.WSMan.Runtime/project.json | 3 ++- src/System.Management.Automation/project.json | 1 + src/TypeCatalogGen/project.json | 3 ++- src/TypeCatalogParser/project.json | 3 ++- src/powershell-unix/project.json | 3 ++- src/powershell-win-core/project.json | 3 ++- 27 files changed, 47 insertions(+), 23 deletions(-) diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/project.json b/src/Microsoft.Management.Infrastructure.CimCmdlets/project.json index 9e21e52ae5..d87afa018d 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/project.json +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/project.json @@ -6,7 +6,7 @@ "keyFile": "../signing/visualstudiopublic.snk", "delaySign": true, "publicSign": false, - "warningsAsErrors": true, + "warningsAsErrors": true }, "dependencies": { @@ -17,8 +17,9 @@ "netstandard1.6": { "imports": [ "dnxcore50"], "buildOptions": { - "define": [ "CORECLR" ] - }, + "define": [ "CORECLR" ], + "debugType": "portable" + } }, "net451": { "frameworkAssemblies": { diff --git a/src/Microsoft.PackageManagement.ArchiverProviders/project.json b/src/Microsoft.PackageManagement.ArchiverProviders/project.json index fa6fe42ae2..ff003294c0 100644 --- a/src/Microsoft.PackageManagement.ArchiverProviders/project.json +++ b/src/Microsoft.PackageManagement.ArchiverProviders/project.json @@ -44,8 +44,9 @@ "netstandard1.6": { "imports": ["dnxcore50"], "buildOptions": { - "define": ["CORECLR"] + "define": ["CORECLR"], + "debugType": "portable" } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.PackageManagement.CoreProviders/project.json b/src/Microsoft.PackageManagement.CoreProviders/project.json index db190187ad..1c595b8fca 100644 --- a/src/Microsoft.PackageManagement.CoreProviders/project.json +++ b/src/Microsoft.PackageManagement.CoreProviders/project.json @@ -44,7 +44,8 @@ "netstandard1.6": { "imports": ["dnxcore50"], "buildOptions": { - "define": ["CORECLR", "PORTABLE"], + "define": ["CORECLR", "PORTABLE"], + "debugType": "portable", "compile": { "exclude": [ "ProgramsProvider.cs"] } diff --git a/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json b/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json index 854a72ffc1..6806044fc9 100644 --- a/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json +++ b/src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json @@ -44,8 +44,9 @@ "netstandard1.6": { "imports": ["dnxcore50"], "buildOptions": { - "define": ["CORECLR"] + "define": ["CORECLR"], + "debugType": "portable" } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.PackageManagement.MsiProvider/project.json b/src/Microsoft.PackageManagement.MsiProvider/project.json index fd5319bb02..7101dcf0d0 100644 --- a/src/Microsoft.PackageManagement.MsiProvider/project.json +++ b/src/Microsoft.PackageManagement.MsiProvider/project.json @@ -42,4 +42,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.PackageManagement.MsuProvider/project.json b/src/Microsoft.PackageManagement.MsuProvider/project.json index a87fb53034..a44838f3d0 100644 --- a/src/Microsoft.PackageManagement.MsuProvider/project.json +++ b/src/Microsoft.PackageManagement.MsuProvider/project.json @@ -42,4 +42,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.PackageManagement.NuGetProvider/project.json b/src/Microsoft.PackageManagement.NuGetProvider/project.json index 38ed12469d..2bbea0238c 100644 --- a/src/Microsoft.PackageManagement.NuGetProvider/project.json +++ b/src/Microsoft.PackageManagement.NuGetProvider/project.json @@ -53,6 +53,7 @@ "imports": ["dnxcore50"], "buildOptions": { "define": ["CORECLR"], + "debugType": "portable", "compile": { "include": [ "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/Extensions.cs", @@ -66,4 +67,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json index 405f709ff0..581cb2330e 100644 --- a/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json +++ b/src/Microsoft.PackageManagement.PackageSourceListProvider/project.json @@ -54,6 +54,7 @@ "imports": ["dnxcore50"], "buildOptions": { "define": ["CORECLR"], + "debugType": "portable", "compile": { "include": [ "../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/*.cs", diff --git a/src/Microsoft.PackageManagement/project.json b/src/Microsoft.PackageManagement/project.json index 56b0f2e4e0..3fbd7d7d18 100644 --- a/src/Microsoft.PackageManagement/project.json +++ b/src/Microsoft.PackageManagement/project.json @@ -49,6 +49,7 @@ "imports": [ "dnxcore50" ], "buildOptions": { "define": [ "CORECLR", "PORTABLE" ], + "debugType": "portable", "compile": { "exclude": [ "Providers/Inbox/Common/*" ] } diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/project.json b/src/Microsoft.PowerShell.Commands.Diagnostics/project.json index 3cf1d12ce0..e2a97270bc 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/project.json +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/project.json @@ -19,6 +19,7 @@ "imports": [ "dnxcore50" ], "buildOptions": { "define": [ "CORECLR" ], + "debugType": "portable", "compile": { "excludeFiles": [ "PdhSafeHandle.cs", diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 150e92de59..0edc7bd5b0 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -29,6 +29,7 @@ "imports": [ "dnxcore50" ], "buildOptions": { "define": [ "CORECLR" ], + "debugType": "portable", "compile": { "exclude": [ "commands/management/ClearRecycleBinCommand.cs", diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index 562aaf0757..a124f4b036 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -20,6 +20,7 @@ "netstandard1.6": { "buildOptions": { "define": [ "CORECLR" ], + "debugType": "portable", "compile": { "exclude": [ "commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs", diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index d2f2a8f230..7942b247c0 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -30,6 +30,7 @@ "imports": [ "dnxcore50", "portable-net45+win8" ], "buildOptions": { "define": [ "CORECLR" ], + "debugType": "portable", "compile": { "exclude": [ "singleshell/installer/EngineInstaller.cs", diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 841c27e46f..961d1e0047 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -22,7 +22,8 @@ "netstandard1.6": { "imports": [ "dnxcore50" ], "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "dependencies": { "NETStandard.Library": "1.6.0", diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json index eb0e4168a4..7cdd49a42c 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -16,7 +16,8 @@ "netstandard1.6": { "imports": [ "dnxcore50" ], "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "dependencies": { "NETStandard.Library": "1.6.0", diff --git a/src/Microsoft.PowerShell.LocalAccounts/project.json b/src/Microsoft.PowerShell.LocalAccounts/project.json index 198370594a..656c6ff372 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/project.json +++ b/src/Microsoft.PowerShell.LocalAccounts/project.json @@ -18,7 +18,8 @@ "netstandard1.6": { "imports": [ "dnxcore50" ], "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "dependencies": { "System.Net.NameResolution": "4.0.0" diff --git a/src/Microsoft.PowerShell.PSReadLine/project.json b/src/Microsoft.PowerShell.PSReadLine/project.json index ca228c8a64..e68f7d42a6 100644 --- a/src/Microsoft.PowerShell.PSReadLine/project.json +++ b/src/Microsoft.PowerShell.PSReadLine/project.json @@ -25,7 +25,8 @@ "frameworks": { "netstandard1.6": { "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "imports": [ "dnxcore50", "portable-net45+win8" ] }, diff --git a/src/Microsoft.PowerShell.PackageManagement/project.json b/src/Microsoft.PowerShell.PackageManagement/project.json index 6bd4d654a4..7cf2bd2e9a 100644 --- a/src/Microsoft.PowerShell.PackageManagement/project.json +++ b/src/Microsoft.PowerShell.PackageManagement/project.json @@ -52,8 +52,9 @@ "netstandard1.6": { "imports": [ "dnxcore50" ], "buildOptions": { - "define": ["CORECLR"] + "define": ["CORECLR"], + "debugType": "portable" } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.PowerShell.ScheduledJob/project.json b/src/Microsoft.PowerShell.ScheduledJob/project.json index 9c30e2380b..5c0142a379 100644 --- a/src/Microsoft.PowerShell.ScheduledJob/project.json +++ b/src/Microsoft.PowerShell.ScheduledJob/project.json @@ -7,7 +7,7 @@ "keyFile": "../signing/visualstudiopublic.snk", "delaySign": true, "publicSign": false, - "warningsAsErrors": true, + "warningsAsErrors": true }, "dependencies": { diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json index da0bbddea7..e7a9af0fa1 100644 --- a/src/Microsoft.PowerShell.Security/project.json +++ b/src/Microsoft.PowerShell.Security/project.json @@ -29,6 +29,7 @@ "imports": [ "dnxcore50" ], "buildOptions": { "define": [ "CORECLR" ], + "debugType": "portable", "compile": { "exclude": [ "security/CertificateCommands.cs", diff --git a/src/Microsoft.WSMan.Management/project.json b/src/Microsoft.WSMan.Management/project.json index 9e5504fc16..b888ffbf74 100644 --- a/src/Microsoft.WSMan.Management/project.json +++ b/src/Microsoft.WSMan.Management/project.json @@ -19,6 +19,7 @@ "imports": [ "dnxcore50" ], "buildOptions": { "define": [ "CORECLR" ], + "debugType": "portable", "compile": { "exclude": [ "WsManSnapin.cs" diff --git a/src/Microsoft.WSMan.Runtime/project.json b/src/Microsoft.WSMan.Runtime/project.json index 39294debaa..23a067c921 100644 --- a/src/Microsoft.WSMan.Runtime/project.json +++ b/src/Microsoft.WSMan.Runtime/project.json @@ -13,7 +13,8 @@ "netstandard1.6": { "imports": [ "dnxcore50" ], "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "dependencies": { "NETStandard.Library": "1.6.0", diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 10b2effc60..796bf2d6d9 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -29,6 +29,7 @@ "imports": [ "dnxcore50" ], "buildOptions": { "define": [ "CORECLR", "PORTABLE" ], + "debugType": "portable", "compile": { "exclude": [ "cimSupport/cmdletization/xml/cmdlets-over-objects.objectModel.autogen.cs", diff --git a/src/TypeCatalogGen/project.json b/src/TypeCatalogGen/project.json index 2a2361b427..b86875d9a5 100644 --- a/src/TypeCatalogGen/project.json +++ b/src/TypeCatalogGen/project.json @@ -4,7 +4,8 @@ "description": "Generates CorePsTypeCatalog.cs given powershell.inc", "buildOptions": { - "emitEntryPoint": true + "emitEntryPoint": true, + "debugType": "portable" }, "frameworks": { diff --git a/src/TypeCatalogParser/project.json b/src/TypeCatalogParser/project.json index b9ae495556..d6dd1377c2 100644 --- a/src/TypeCatalogParser/project.json +++ b/src/TypeCatalogParser/project.json @@ -1,7 +1,8 @@ { "buildOptions": { "warningsAsErrors": true, - "emitEntryPoint": true + "emitEntryPoint": true, + "debugType": "portable" }, "dependencies": { diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json index 2e0fa0abdf..6dd3c889d5 100644 --- a/src/powershell-unix/project.json +++ b/src/powershell-unix/project.json @@ -65,7 +65,8 @@ "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net45+win8" ], "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "dependencies": { "Microsoft.NETCore.App": "1.0.0", diff --git a/src/powershell-win-core/project.json b/src/powershell-win-core/project.json index e42944776d..a46fd06025 100644 --- a/src/powershell-win-core/project.json +++ b/src/powershell-win-core/project.json @@ -69,7 +69,8 @@ "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net45+win8" ], "buildOptions": { - "define": [ "CORECLR" ] + "define": [ "CORECLR" ], + "debugType": "portable" }, "dependencies": { "Microsoft.NETCore.App": "1.0.0",