Adding debugType portable to project.json. (PowerShell#1959)

adamdriscoll · daxian-dbw · commit c829d9e91551 · 2016-08-23T10:38:25.000-07:00
* 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.
diff --git 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
@@ -44,8 +44,9 @@
 		"netstandard1.6": {
 			"imports": ["dnxcore50"],
 			"buildOptions": {
-				"define": ["CORECLR"]
+				"define": ["CORECLR"],
+                "debugType": "portable"
 			}
 		}
 	}
-}
+}
diff --git 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
@@ -44,8 +44,9 @@
 		"netstandard1.6": {
 			"imports": ["dnxcore50"],
 			"buildOptions": {
-				"define": ["CORECLR"]
+				"define": ["CORECLR"],
+                "debugType": "portable"
 			}
 		}
 	}
-}
+}
diff --git a/src/Microsoft.PackageManagement.MsiProvider/project.json b/src/Microsoft.PackageManagement.MsiProvider/project.json
@@ -42,4 +42,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/src/Microsoft.PackageManagement.MsuProvider/project.json b/src/Microsoft.PackageManagement.MsuProvider/project.json
@@ -42,4 +42,4 @@
 			}
 		}
 	}
-}
+}
diff --git 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 @@
       }
 		}
 	}
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -52,8 +52,9 @@
 		"netstandard1.6": {
       "imports": [ "dnxcore50" ],
 			"buildOptions": {
-				"define": ["CORECLR"]
+				"define": ["CORECLR"],
+        "debugType": "portable"
 			}
 		}
 	}
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,9 @@`
`44`	`44`	`"netstandard1.6": {`
`45`	`45`	`"imports": ["dnxcore50"],`
`46`	`46`	`"buildOptions": {`
`47`		`- "define": ["CORECLR"]`
	`47`	`+ "define": ["CORECLR"],`
	`48`	`+ "debugType": "portable"`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`
`51`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,4 @@`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`-}`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`"imports": ["dnxcore50"],`
`54`	`54`	`"buildOptions": {`
`55`	`55`	`"define": ["CORECLR"],`
	`56`	`+ "debugType": "portable",`
`56`	`57`	`"compile": {`
`57`	`58`	`"include": [`
`58`	`59`	`"../Microsoft.PackageManagement/Providers/Inbox/Common/Extensions/Extensions.cs",`
`@@ -66,4 +67,4 @@`
`66`	`67`	`}`
`67`	`68`	`}`
`68`	`69`	`}`
`69`		`-}`
	`70`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@`
`49`	`49`	`"imports": [ "dnxcore50" ],`
`50`	`50`	`"buildOptions": {`
`51`	`51`	`"define": [ "CORECLR", "PORTABLE" ],`
	`52`	`+ "debugType": "portable",`
`52`	`53`	`"compile": {`
`53`	`54`	`"exclude": [ "Providers/Inbox/Common/*" ]`
`54`	`55`	`}`