[dotnet] Put packages (.ipa/.pkg) in the publish directory by default. (#13436)

Partial fix for #12997.
This commit is contained in:
Rolf Bjarne Kvinge 2021-11-24 16:00:16 +01:00 коммит произвёл GitHub
Родитель 4baa67a07d
Коммит 4afc8f7e3f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 8 добавлений и 1 удалений

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

@ -4,6 +4,10 @@
<PropertyGroup>
<BuildIpa Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'">true</BuildIpa>
<CreatePackage Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</CreatePackage>
<!-- Put packages in the publish directory unless asked to do otherwise -->
<IpaPackageDir Condition="'$(IpaPackageDir)' == '' And '$(IpaPackagePath)' == ''">$(PublishDir)</IpaPackageDir>
<PkgPackageDir Condition="'$(PkgPackageDir)' == '' And '$(PkgPackagePath)' == ''">$(PublishDir)</PkgPackageDir>
</PropertyGroup>
</Target>
<Target Name="Publish" DependsOnTargets="_PrePublish;Build">

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

@ -2275,6 +2275,9 @@ Copyright (C) 2018 Microsoft. All rights reserved.
</Target>
<Target Name="_CreateInstaller" Condition="'$(CreatePackage)' == 'true' And '$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="Codesign;_CompileProductDefinition;_WriteAppManifest">
<PropertyGroup>
<PkgPackageDir Condition="'$(PkgPackageDir)' == ''">$(TargetDir)</PkgPackageDir>
</PropertyGroup>
<CreateInstallerPackage
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
@ -2283,7 +2286,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
EnablePackageSigning="$(EnablePackageSigning)"
MainAssembly="$(TargetPath)"
Name="$(AssemblyName)"
OutputDirectory="$(TargetDir)"
OutputDirectory="$(PkgPackageDir)"
PackageSigningKey="$(PackageSigningKey)"
PackagingExtraArgs="$(PackagingExtraArgs)"
PkgPackagePath="$(PkgPackagePath)"