Skip to content

[msbuild] Use stamp files to force container app's _CompileToNative #1879

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
spouliot merged 1 commit into from
Mar 16, 2017
Merged

[msbuild] Use stamp files to force container app's _CompileToNative #1879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 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 @@ -367,6 +367,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.

<Target Name="_CleanAppBundle" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="_GenerateBundleName">
<RemoveDir SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Directories="$(_AppBundlePath)" />
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(DeviceSpecificOutputPath)mtouch.stamp" />
</Target>

<Target Name="_CleanUploaded" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="_ComputeTargetArchitectures">
Expand Down Expand Up @@ -719,13 +720,21 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
_CompileEntitlements;
_CompileAppManifest;
_ResolveAppExtensionReferences;
_GetNativeExecutableName
_GetNativeExecutableName;
_GetCompileToNativeInputs
</_CompileToNativeDependsOn>
</PropertyGroup>

<Target Name="_GetCompileToNativeInputs">
<ItemGroup>
<_CompileToNativeInput Include="$(TargetDir)$(TargetFileName)" />
<_CompileToNativeInput Condition="'@(_ResolvedAppExtensionReferences)' != ''" Include="%(_ResolvedAppExtensionReferences.Identity)\..\mtouch.stamp" />
</ItemGroup>
</Target>

<Target Name="_CompileToNative" DependsOnTargets="$(_CompileToNativeDependsOn)"
Inputs="$(TargetDir)$(TargetFileName)"
Outputs="$(_NativeExecutable)">
Inputs="@(_CompileToNativeInput)"
Outputs="$(_NativeExecutable);$(DeviceSpecificOutputPath)mtouch.stamp">

<ItemGroup>
<MTouchReferencePath Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll'" />
Expand Down Expand Up @@ -777,6 +786,15 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
>
<Output TaskParameter="CompiledArchitectures" PropertyName="_CompiledArchitectures" />
</MTouch>

<Touch
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
AlwaysCreate="true"
Files="$(DeviceSpecificOutputPath)mtouch.stamp"
>
<Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
</Touch>
</Target>

<Target Name="_ParseExtraMtouchArgs">
Expand Down