Skip to content

Fixes AdHoc IPA with ODR failing to install from iTunes #18

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
jstedfast merged 3 commits into from
May 2, 2016
Merged

Fixes AdHoc IPA with ODR failing to install from iTunes #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b838b60
Avoid codesigning embedded assetpacks for AdHoc IPA
emaf Apr 25, 2016
b359fae
[ODR] Sign app bundle if the AssetPackaManifest has changed
emaf Apr 26, 2016
d25da2a
Set IsStreamable to false if the ODR are Embed
emaf Apr 26, 2016
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
22 changes: 20 additions & 2 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,9 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
<_IntermediateODRDir Condition="'$(_DistributionType)' == 'AdHoc' And '$(EmbedOnDemandResources)' == 'false'">$(DeviceSpecificIntermediateOutputPath)OnDemandResourcesPackage\OnDemandResources\</_IntermediateODRDir>

<OnDemandResourcesUrl Condition="'$(_DistributionType)' == 'AdHoc' And '$(EmbedOnDemandResources)' == 'true'">OnDemandResources</OnDemandResourcesUrl>

<IsStreamable>false</IsStreamable>
<IsStreamable Condition="$(EmbedOnDemandResources) == 'false'">true</IsStreamable>
</PropertyGroup>

<RemoveDir SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)'" Directories="$(_IntermediateODRDir)" />
Expand Down Expand Up @@ -1650,7 +1653,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
<!-- Sign assetpacks -->
<Codesign
SessionId="$(BuildSessionId)"
Condition="'$(MtouchTargetsEnabled)' And '@(_AssetPack)' != ''"
Condition="'$(MtouchTargetsEnabled)' And '@(_AssetPack)' != '' And '$(_DistributionType)' == 'AppStore'"
ToolExe="$(CodesignExe)"
ToolPath="$(CodesignPath)"
CodesignAllocate="$(_CodesignAllocate)"
Expand All @@ -1668,11 +1671,26 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
TemplatePath="$(_IpaAppBundleDir)AssetPackManifestTemplate.plist"
OutputFile="$(_IpaAppBundleDir)AssetPackManifest.plist"
OnDemandResourceUrl="$(OnDemandResourcesUrl)"
IsStreamable="true"
IsStreamable="$(IsStreamable)"
/>

<Delete SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)' And '$(_DistributionType)' == 'AdHoc' And Exists('$(_IntermediateODRDir)')" Files="$(_IpaAppBundleDir)AssetPackManifestTemplate.plist" />

<!-- Re-sign app bundle if anything changed inside of it -->
<Codesign
SessionId="$(BuildSessionId)"
Condition="'$(MtouchTargetsEnabled)' And '$(_DistributionType)' == 'AdHoc' And Exists('$(_IntermediateODRDir)')"
ToolExe="$(CodesignExe)"
ToolPath="$(CodesignPath)"
CodesignAllocate="$(_CodesignAllocate)"
Keychain="$(CodesignKeychain)"
Entitlements="$(DeviceSpecificIntermediateOutputPath)Entitlements.xcent"
ResourceRules="$(_PreparedResourceRules)"
Resource="$(_IpaAppBundleDir)"
SigningKey="$(_CodeSigningKey)"
ExtraArgs="$(CodesignExtraArgs)"
/>

<RemoveDir SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)' And '$(EmbedOnDemandResources)' == 'false'" Directories="$(_IpaOutputDir)OnDemandResources\" />
<MakeDir SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)' And '$(EmbedOnDemandResources)' == 'false'" Directories="$(_IpaOutputDir)OnDemandResources\" />

Expand Down