[installer] Include symbols and add whitelist files (#3624)

Changes: xamarin/monodroid@9a1dbc5...28ffbd3

Bumps to xamarin/monodroid@28ffbd3d.

Context: xamarin/monodroid@6047f4a
Context: #3662
Context: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/732/Insertion-Symbol-Check-PR-Policy
Context: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/671/Manage-Your-Symbols

Policy, eschewed for too long by Xamarin.Android, is for debug symbol
information to be collected for all binaries publicly released.  This
is so that when a customer reports an error with a stack trace, it
can be associated with filename and line number information.

Unfortunately, prior Xamarin.Android efforts to actually follow this
policy have not been as successful as we might like.

Additionally, with our current "inverted" build system (3e998b2),
the previous work in this area is obsolete and needs re-thinking.

Solve our internal problems and some customer-facing external
problems by shipping all `.pdb` files in the `.pkg` and `.vsix`
installers, instead of attempting to keep the `.pdb` files separate
from the installers.  (The original rationale for keeping them
separate was to keep the installer size from being *too* ridiculous
-- which is *not* helped by ~20-30MB `Mono.Android.dll` files --
but life is easier if we just include debug symbols in the installer,
and it doesn't increase the installer size *that* much...)

For files that we can't provide `.pdb` files for -- usually because
`.pdb` files don't exist, e.g. for Facade assemblies which don't
contain any code in the first place, or because the NuGet package
providing the assembly doesn't provide symbols -- two "whitelist"
files are used to provide exclusion lists to internal tools:

  * `build-tools/create-vsix/symbols/ExternalWhiteList.csv`:
    Files which come from external sources (NuGet packages, etc.)
    which lack debug symbols.

  * `build-tools/create-vsix/symbols/SymbolArchiveWhiteList.csv`:
    Files which are generated by the xamarin-android build or build
    dependencies (e.g. mono) which lack debug symbols.

The [Visual Studio Insertion Process][0] has also been updated to
upload and archive copies of all relevant executable and symbol files
directly from the `.vsix` installer, rather than using a separate
`symbols.zip` file.

Publishing symbol files for the executable files we ship will make it
easier to investigate any potential hangs/crashes reported through
telemetry and other monitoring services.

[0]: https://devdiv.visualstudio.com/DevDiv/_release?definitionId=1755&view=mine&_a=releases

.external

@@ -1,2 +1,2 @@
-xamarin/monodroid:master@9a1dbc5f56717b88f952c6597a52c14dd5226030
+xamarin/monodroid:master@28ffbd3d031e96d8dc5d4d201ee41dabc261d471
 mono/mono:2019-08@d8441deead62b3af591c6daefb5013b09ef1ab8b

build-tools/create-vsix/create-vsix.csproj

@@ -10,7 +10,7 @@
     <AssemblyName>Xamarin.Android.Sdk</AssemblyName>
     <CreateVsixContainer Condition=" '$(CreateVsixContainer)' == '' ">False</CreateVsixContainer>
     <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>False</CopyOutputSymbolsToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>True</CopyOutputSymbolsToOutputDirectory>
     <GeneratePkgDefFile>False</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeCopyLocalReferencesInVSIXContainer>False</IncludeCopyLocalReferencesInVSIXContainer>

build-tools/create-vsix/symbols/ExternalWhiteList.csv

@@ -0,0 +1,19 @@
+# -------------------------------------------------------------------------------
+# This is the whitelist for all of executable files that won't be symbol archived
+# In this format:
+# [fileName|FilePattern],comment
+# It will also ignore any empty line or lines that begin with '#'
+# -------------------------------------------------------------------------------
+
+# Xamarin.Android Mono non-facade assemblies which have no symbols - pecolli, jopryo
+# See also: https://github.com/xamarin/xamarin-android/blob/1d053ec45b416c2ad1d8e2b702ab201b595f7975/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs#L138
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*\System.Runtime.CompilerServices.Unsafe.dll
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*\System.Windows.dll
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*\System.Xml.Serialization.dll
+
+# Xamarin.Android 3rd party assemblies - pecolli, jopryo
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\FSharp.Compiler.CodeDom.dll
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\FSharp.Core.dll
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\INIFileParser.dll
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\Irony.dll
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\libZipSharp.dll

build-tools/create-vsix/symbols/SymbolArchiveWhiteList.csv

@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------------------
+# This is the whitelist for all of executable files that won't be symbol archived
+# In this format:
+# [fileName|FilePattern],comment
+# It will also ignore any empty line or lines that begin with '#'
+# -------------------------------------------------------------------------------
+#
+# Xamarin.Android - pecolli, jopryo
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*referenceassemblies\*\facades\*, Facade assemblies.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\bcl\*, 'Designer profile' assemblies.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\ICSharpCode.SharpZipLib.dll, Fails Pdb2Pdb.exe conversion.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\illinkanalyzer.exe, Fails Pdb2Pdb.exe conversion.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\Java.Interop.dll, Fails Pdb2Pdb.exe conversion.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\mdoc.exe, Fails Pdb2Pdb.exe conversion.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\mkbundle.exe, Fails Pdb2Pdb.exe conversion.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\mono-symbolicate.exe, Fails Pdb2Pdb.exe conversion.
+xamarin.android.sdk*\xamarin.android.sdk*.vsixdir\*msbuild\xamarin\android\pdb2mdb.exe, Fails Pdb2Pdb.exe conversion.

build-tools/installers/create-installers.targets

@@ -87,7 +87,9 @@
     <_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.dll" />
     <_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\OpenTK-1.0.pdb" />
     <_FrameworkFiles Include="@(MonoFacadeAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\Facades\%(Identity)')" />
+    <_FrameworkFiles Include="@(MonoFacadeAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\Facades\%(Identity)')" />
     <_FrameworkFiles Include="@(MonoProfileAssembly->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" />
+    <_FrameworkFiles Include="@(MonoProfileAssemblySymbol->'$(FrameworkSrcDir)\$(BclFrameworkVersion)\%(Identity)')" />
     <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Java.Interop.dll" />
     <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Data.Sqlite.dll.config" />
     <_FrameworkFiles Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Mono.Posix.dll" />
@@ -99,29 +101,46 @@
   <ItemGroup>
     <_MSBuildFiles Include="$(MSBuildSrcDir)\android-support-multidex.jar" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\aprofutil.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\aprofutil.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\cil-strip.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\cil-strip.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\class-parse.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\class-parse.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\desugar_deploy.jar" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\FSharp.Compiler.CodeDom.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\FSharp.Core.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\generator.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\generator.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\HtmlAgilityPack.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\HtmlAgilityPack.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\ICSharpCode.SharpZipLib.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\ICSharpCode.SharpZipLib.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\illinkanalyzer.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\illinkanalyzer.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Irony.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\java-interop.jar" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\javadoc-to-mdoc.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\javadoc-to-mdoc.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.dll.config" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Export.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Export.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Cecil.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Cecil.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Diagnostics.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Diagnostics.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll.config" Condition=" '$(HostOS)' != 'Windows' " />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\jcw-gen.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\jcw-gen.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\jit-times.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\jit-times.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\jnimarshalmethod-gen.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\jnimarshalmethod-gen.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\LayoutBinding.cs" />
     <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\%(Identity)\libmono-android.debug.so')" />
     <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MSBuildSrcDir)\lib\%(Identity)\libmono-android.release.so')" />
@@ -137,18 +156,26 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\libZipSharp.dll.config" Condition=" '$(HostOS)' != 'Windows' " />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Posix.NETStandard.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Profiler.Log.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Profiler.Log.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\logcat-parse.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\logcat-parse.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\mdoc.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\mdoc.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\mkbundle.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\mkbundle.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\mkbundle-api.h" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\mono-symbolicate.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\mono-symbolicate.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CSharp.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CompilerServices.SymbolWriter.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CompilerServices.SymbolWriter.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Options.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Terminal.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\monodoc.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\monodoc.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\MULTIDEX_JAR_LICENSE" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\pdb2mdb.exe" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\pdb2mdb.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\proguard\lib\proguard.jar"/>
     <_MSBuildFiles Include="$(MSBuildSrcDir)\proguard\license.html" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\startup.aotprofile" />
@@ -165,9 +192,12 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Analysis.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Bindings.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Build.Tasks.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Build.Tasks.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.BuildInfo.txt" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Cecil.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Cecil.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Cecil.Mdb.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Cecil.Mdb.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Common.props" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Common.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.CSharp.targets" />
@@ -178,13 +208,20 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.PCLSupport.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.SkipCases.projitems" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Aidl.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Aidl.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AndroidSdk.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AndroidSdk.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AnnotationSupport.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AnnotationSupport.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.ApiXmlAdjuster.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.ApiXmlAdjuster.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Bytecode.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Bytecode.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.JavaDocImporter.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.JavaDocImporter.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.VisualBasic.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.pdb" />
   </ItemGroup>
   <ItemGroup>
     <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.Bindings.After.targets" />
@@ -305,6 +342,7 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\INIFileParser.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\jar2xml.jar" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.AndroidTools.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.AndroidTools.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Android.DebugRuntime-arm64-v8a.apk" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Android.DebugRuntime-armeabi-v7a.apk" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Android.DebugRuntime-debug.apk" />
@@ -314,14 +352,20 @@
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Analysis.Compatibility.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Analysis.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Analysis.Tasks.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Analysis.Tasks.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Build.Debugging.Tasks.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Build.Debugging.Tasks.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Common.Debugging.props" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Common.Debugging.targets" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.ResourceProcessors.dll" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.AndroidTools.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.AndroidTools.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.AndroidSDK.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.AndroidSDK.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Build.Tasks.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Build.Tasks.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Common.dll" />
+    <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Common.pdb" />
     <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Installer.Common.targets" />
     <LegacyTargetsFiles Include="$(RootBuildDir)\lib\xamarin.android\xbuild\Novell\Xamarin.Android.Bindings.targets" />
     <LegacyTargetsFiles Include="$(RootBuildDir)\lib\xamarin.android\xbuild\Novell\Xamarin.Android.VisualBasic.targets" />

build-tools/xaprepare/xaprepare/Application/GeneratedProfileAssembliesProjitemsFile.cs

@@ -129,6 +129,9 @@ void WriteGroup (StreamWriter sw, string itemName, IEnumerable<BclFile> files)
 			foreach (BclFile bcf in files) {
 				sw.WriteLine ($"    <{itemName} Include=\"{bcf.Name}\" />");
 			}
+			foreach (BclFile bcf in files.Where (b => !b.ExcludeDebugSymbols)) {
+				sw.WriteLine ($"    <{itemName}Symbol Include=\"{Path.GetFileName (bcf.DebugSymbolsPath)}\" />");
+			}
 			EndGroup (sw);
 		}
 

build-tools/xaprepare/xaprepare/Application/MonoRuntimesHelpers.cs

@@ -125,7 +125,7 @@ public static (string assembly, string debugSymbols) GetDestinationPaths (BclFil
 			}
 
 			string destFile = Path.Combine (destDir, bf.Name);
-			if (bf.ExcludeDebugSymbols || String.IsNullOrEmpty (bf.DebugSymbolsPath))
+			if (bf.ExcludeDebugSymbols)
 				return (destFile, null);
 
 			return (destFile, Path.Combine (destDir, Path.GetFileName (bf.DebugSymbolsPath)));

build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.Code.cs

@@ -227,7 +227,7 @@ public Runtimes ()
 
 		List<BclFile> BclToDesigner (BclFileTarget ignoreForTarget)
 		{
-			return BclFilesToInstall.Where (bf => ShouldIncludeDesignerBcl (bf)).Select (bf => new BclFile (bf.Name, bf.Type, excludeDebugSymbols: true, version: bf.Version, target: ignoreForTarget)).ToList ();
+			return BclFilesToInstall.Where (bf => ShouldIncludeDesignerBcl (bf)).Select (bf => new BclFile (bf.Name, bf.Type, bf.ExcludeDebugSymbols, version: bf.Version, target: ignoreForTarget)).ToList ();
 
 			bool ShouldIncludeDesignerBcl (BclFile bf)
 			{