Skip to content

[dotnet] Honor existing values for BuildIpa and CreatePackage. Fixes #15696. #15697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 2 commits into from
Aug 25, 2022
Merged

[dotnet] Honor existing values for BuildIpa and CreatePackage. Fixes #15696. #15697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26c7da5
[dotnet] Honor existing values for BuildIpa and CreatePackage. Fixes …
rolfbjarne Aug 18, 2022
f747f86
[msbuild] Don't set a default value for BuildIpa/CreatePackage.
rolfbjarne Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dotnet/targets/Xamarin.Shared.Sdk.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="_PrePublish">
<PropertyGroup>
<BuildIpa Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'">true</BuildIpa>
<CreatePackage Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</CreatePackage>
<BuildIpa Condition="'$(BuildIpa)' == '' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS')">true</BuildIpa>
<CreatePackage Condition="'$(CreatePackage)' == '' And ('$(_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>
Expand All @@ -29,7 +29,7 @@
/>
</Target>
<Target Name="Publish" DependsOnTargets="_PrePublish;Build">
<Message Importance="high" Text="Created the package: $(IpaPackagePath)" Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'" />
<Message Importance="high" Text="Created the package: $(PkgPackagePath)" Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'" />
<Message Importance="high" Text="Created the package: $(IpaPackagePath)" Condition="'$(BuildIpa)' == 'true' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS')" />
<Message Importance="high" Text="Created the package: $(PkgPackagePath)" Condition="'$(CreatePackage)' == 'true' And ('$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst')" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Shared/Xamarin.Shared.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Copyright (C) 2020 Microsoft. All rights reserved.

<!-- If we should create a .pkg or not (only relevant for macOS / Mac Catalyst) -->
<!-- The equivalent property for the other platforms is 'BuildIpa' -->
<CreatePackage Condition="'$(CreatePackage)' == ''">false</CreatePackage>
<CreatePackage Condition="'$(CreatePackage)' == '' And '$(UsingAppleNETSdk)' != 'true'">false</CreatePackage>

<!-- If the .pkg should be signed or not. Applicable to macOS and Mac Catalyst. Defaults to false. -->
<EnablePackageSigning Condition="'$(EnablePackageSigning)' == ''">false</EnablePackageSigning>
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
<MtouchVerbosity Condition="$(MtouchVerbosity) == ''">2</MtouchVerbosity>

<IpaIncludeArtwork Condition="'$(IpaIncludeArtwork)' == ''">False</IpaIncludeArtwork>
<BuildIpa Condition="'$(BuildIpa)' == ''">False</BuildIpa>
<BuildIpa Condition="'$(BuildIpa)' == '' And '$(UsingAppleNETSdk)' != 'true'">False</BuildIpa>
<BuildSessionId></BuildSessionId>

<!-- Backward Compatability -->
Expand Down