Skip to content

[msbuild] Fixed IsWatchExtension state property #913

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 3 commits into from
Oct 3, 2016
Merged

[msbuild] Fixed IsWatchExtension state property #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eee9206
[msbuild] Fixed IsWatchExtension state property
jstedfast Sep 28, 2016
096b76f
[msbuild] Updated ValidateAppBundleTaskBase to validate WatchOS 2+ ap…
jstedfast Sep 29, 2016
677448d
[msbuild] Allow multiple Watch Extensions per WatchOS2 App
jstedfast Oct 3, 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
504 changes: 341 additions & 163 deletions msbuild/Xamarin.iOS.Tasks.Core/Tasks/ValidateAppBundleTaskBase.cs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<_XamarinWatchOSAppExtensionCommonPropsHasBeenImported>true</_XamarinWatchOSAppExtensionCommonPropsHasBeenImported>
</PropertyGroup>

<PropertyGroup>
<_IsWatchExtension>true</_IsWatchExtension>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>

Expand Down
1 change: 1 addition & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<IsAppExtension>True</IsAppExtension>
<IsWatchExtension>True</IsWatchExtension>
<MtouchHttpClientHandler Condition="'$(MtouchHttpClientHandler)' == ''">NSUrlSessionHandler</MtouchHttpClientHandler>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<IsAppExtension>True</IsAppExtension>
<IsWatchExtension>False</IsWatchExtension>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -55,6 +55,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
<MtouchTargetsEnabled>$(IsMacEnabled)</MtouchTargetsEnabled>

<IsAppExtension Condition="'$(IsAppExtension)' == ''">False</IsAppExtension>
<IsWatchExtension Condition="'$(IsWatchExtension)' == ''">False</IsWatchExtension>
<IsWatchApp Condition="'$(IsWatchApp)' == ''">False</IsWatchApp>
<OptimizePNGs Condition="'$(OptimizePNGs)' == ''">True</OptimizePNGs>
<OptimizePropertyLists Condition="'$(OptimizePropertyLists)' == ''">True</OptimizePropertyLists>
Expand Down
8 changes: 2 additions & 6 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 @@ -593,10 +593,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.

<Target Name="GetAppBundleDir" DependsOnTargets="_GenerateBundleName" Returns="$(AppBundleDir)"/>

<PropertyGroup>
<_IsWatchExtension Condition="'$(_IsWatchExtension)' == ''">false</_IsWatchExtension>
</PropertyGroup>

<Target Name="_CompileAppManifest"
DependsOnTargets="_DetectSdkLocations;_DetectAppManifest;_GenerateBundleName;_DetectSigningIdentity;_PrepareResourceRules;_ResolveWatchAppReferences;_DetectDebugNetworkConfiguration"
Inputs="$(_AppManifest);@(_PartialAppManifest)"
Expand All @@ -614,7 +610,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
DefaultSdkVersion="$(MtouchSdkVersion)"
IsAppExtension="$(IsAppExtension)"
IsWatchApp="$(IsWatchApp)"
IsWatchExtension="$(_IsWatchExtension)"
IsWatchExtension="$(IsWatchExtension)"
PartialAppManifests="@(_PartialAppManifest)"
ResourceRules="$(_PreparedResourceRules)"
TargetFrameworkIdentifier="$(TargetFrameworkIdentifier)"
Expand Down Expand Up @@ -1469,7 +1465,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
Condition="'@(_WatchAppReferenceWithConfigurationNonExistent)' != ''"/>

<PropertyGroup>
<_IsWatchExtension Condition="'@(_ResolvedWatchAppReferences)' != ''">true</_IsWatchExtension>
<IsWatchExtension Condition="'$(IsAppExtension)' == 'true' And '@(_ResolvedWatchAppReferences)' != ''">True</IsWatchExtension>
</PropertyGroup>
</Target>

Expand Down
2 changes: 1 addition & 1 deletion msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/WatchKit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void InvalidBundleIdTest ()
Engine.GlobalProperties.SetProperty ("Platform", Platform);
AppBundlePath = mtouchPaths ["app_bundlepath"];
RunTarget (proj, "Build", 2);
Assert.AreEqual ("The App Extension WatchExtension has an invalid CFBundleIdentifier (com.xamarin.MyWatchApp.WatchExtension), it does not begin with the main app bundle's CFBundleIdentifier (com.xamarin.MyWatchAppX).", Engine.Logger.ErrorEvents [0].Message, "#1");
Assert.AreEqual ("The App Extension 'WatchExtension' has an invalid CFBundleIdentifier (com.xamarin.MyWatchApp.WatchExtension), it does not begin with the main app bundle's CFBundleIdentifier (com.xamarin.MyWatchAppX).", Engine.Logger.ErrorEvents [0].Message, "#1");
Assert.AreEqual ("The Watch App 'WatchApp' has an invalid WKCompanionAppBundleIdentifier value ('com.xamarin.MyWatchApp'), it does not match the main app bundle's CFBundleIdentifier ('com.xamarin.MyWatchAppX').", Engine.Logger.ErrorEvents [1].Message, "#2");
}
}
Expand Down