[dotnet] Make bundling the 'createdump' utility opt-in. Fixes #16189. (#18960)

Make bundling the 'createdump' utility opt-in by setting BundleCreateDump=true.

Fixes: https://github.com/xamarin/xamarin-macios/issues/16189
This commit is contained in:
Rolf Bjarne Kvinge 2023-09-11 09:52:14 +02:00 коммит произвёл GitHub
Родитель 2fba9a81fe
Коммит b44b57e59d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 3 добавлений и 6 удалений

Просмотреть файл

@ -1518,7 +1518,7 @@
PublishFolderType="Assembly"
/>
<ResolvedFileToPublish Remove="@(_CreateDumpExecutable)" />
<ResolvedFileToPublish Include="@(_CreateDumpExecutable)" />
<ResolvedFileToPublish Include="@(_CreateDumpExecutable)" Condition="'$(BundleCreateDump)' == 'true'" />
<!-- Remove any dylibs Mono told us not to link with -->
<ResolvedFileToPublish
@ -1631,7 +1631,7 @@
<Target Name="_ComputeCodesignItems"
Outputs="$(_CodesignItemsPath)"
>
<ItemGroup Condition="'$(_RequireCodeSigning)' == 'true'">
<ItemGroup Condition="'$(_RequireCodeSigning)' == 'true' And '$(BundleCreateDump)' == 'true'">
<!-- The 'createdump' executable must be signed. -->
<!-- Ref: https://github.com/xamarin/xamarin-macios/issues/13417 -->
<_CreateDumpExecutableToSign Include="@(_CreateDumpExecutable -> '$(_DylibPublishDir)%(RelativePath)')" KeepMetadata="false">

Просмотреть файл

@ -294,9 +294,6 @@ namespace Xamarin.Tests {
AddMultiRidAssembly (platform, expectedFiles, assemblyDirectory, Path.GetFileNameWithoutExtension (Configuration.GetBaseLibraryName (platform, true)), runtimeIdentifiers, forceSingleRid: (platform == ApplePlatform.MacCatalyst && !isReleaseBuild) || platform == ApplePlatform.MacOSX, hasPdb: false, includeDebugFiles: includeDebugFiles);
expectedFiles.Add (Path.Combine (assemblyDirectory, "runtimeconfig.bin"));
if (platform == ApplePlatform.MacOSX)
expectedFiles.Add (Path.Combine ("Contents", "MonoBundle", "createdump"));
switch (platform) {
case ApplePlatform.iOS:
case ApplePlatform.TVOS:

Просмотреть файл

@ -635,7 +635,7 @@ namespace Xamarin.Tests {
ExecuteWithMagicWordAndAssert (platform, runtimeIdentifiers, appExecutable);
var createdump = Path.Combine (appPath, "Contents", "MonoBundle", "createdump");
Assert.That (createdump, Does.Exist, "createdump existence");
Assert.That (createdump, Does.Not.Exist, "createdump existence");
}
[Test]