dotnet · VincentDondain · Apr 28, 2016 · Apr 28, 2016 · Apr 28, 2016 · Apr 28, 2016
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 15f20dadb1d57f50c0dce68be9a138404c1dc9fa
+NEEDED_MACCORE_VERSION := 05277dd2bc19bc6d291fcd0639e571b4d222eaef
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
@@ -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)" />
@@ -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)"
@@ -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\" />
 

diff --git a/msbuild/tests/MyActionExtension/Info.plist b/msbuild/tests/MyActionExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>1.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/msbuild/tests/MyMasterDetailApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyMasterDetailApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -94,15 +94,10 @@
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyMetalGame/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyMetalGame/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -94,15 +94,10 @@
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyOpenGLApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyOpenGLApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -94,15 +94,10 @@
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyTVApp/MyTVApp.csproj b/msbuild/tests/MyTVApp/MyTVApp.csproj
@@ -83,6 +83,13 @@
       <DependentUpon>MySingleViewViewController.cs</DependentUpon>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MyTVServicesExtension\MyTVServicesExtension.csproj">
+      <IsAppExtension>true</IsAppExtension>
+      <Project>{0F124570-8B79-4593-B618-A90E51F339DF}</Project>
+      <Name>MyTVServicesExtension</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
   <ItemGroup>
     <InterfaceDefinition Include="MainStoryboard.storyboard" />

diff --git a/msbuild/tests/MyTVServicesExtension/Entitlements.plist b/msbuild/tests/MyTVServicesExtension/Entitlements.plist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>
diff --git a/msbuild/tests/MyTVServicesExtension/Info.plist b/msbuild/tests/MyTVServicesExtension/Info.plist
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>MyTVServicesExtension</string>
+	<key>CFBundleName</key>
+	<string>MyTVServicesExtension</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.xamarin.mytvapp.mytvservicesextension</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>MinimumOSVersion</key>
+	<string>9.2</string>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>TVExtensionProtocols</key>
+			<array>
+				<string>TVTopShelfProvider</string>
+			</array>
+		</dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.tv-services</string>
+		<key>NSExtensionPrincipalClass</key>
+		<string>ServiceProvider</string>
+	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
+</dict>
+</plist>
diff --git a/msbuild/tests/MyTVServicesExtension/MyTVServicesExtension.csproj b/msbuild/tests/MyTVServicesExtension/MyTVServicesExtension.csproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProjectGuid>{0F124570-8B79-4593-B618-A90E51F339DF}</ProjectGuid>
+    <ProjectTypeGuids>{53F59511-8024-45F7-9A2A-2739F70C7A80};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>MyTVServicesExtension</RootNamespace>
+    <AssemblyName>MyTVServicesExtension</AssemblyName>
+    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <MtouchDebug>true</MtouchDebug>
+    <MtouchFastDev>true</MtouchFastDev>
+    <MtouchProfiling>true</MtouchProfiling>
+    <MtouchUseSGen>true</MtouchUseSGen>
+    <MtouchUseRefCounting>true</MtouchUseRefCounting>
+    <MtouchLink>None</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
+    <DeviceSpecificBuild>false</DeviceSpecificBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\iPhone\Release</OutputPath>
+    <DefineConstants></DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <MtouchUseLlvm>true</MtouchUseLlvm>
+    <MtouchUseSGen>true</MtouchUseSGen>
+    <MtouchUseRefCounting>true</MtouchUseRefCounting>
+    <MtouchFloat32>true</MtouchFloat32>
+    <MtouchEnableBitcode>true</MtouchEnableBitcode>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <MtouchArch>ARM64</MtouchArch>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+    <DefineConstants></DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <MtouchUseSGen>true</MtouchUseSGen>
+    <MtouchUseRefCounting>true</MtouchUseRefCounting>
+    <MtouchLink>None</MtouchLink>
+    <MtouchArch>x86_64</MtouchArch>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhone\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <DeviceSpecificBuild>true</DeviceSpecificBuild>
+    <MtouchDebug>true</MtouchDebug>
+    <MtouchFastDev>true</MtouchFastDev>
+    <MtouchProfiling>true</MtouchProfiling>
+    <MtouchUseSGen>true</MtouchUseSGen>
+    <MtouchUseRefCounting>true</MtouchUseRefCounting>
+    <MtouchFloat32>true</MtouchFloat32>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <IOSDebuggerPort>10001</IOSDebuggerPort>
+    <MtouchArch>ARM64</MtouchArch>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.TVOS" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ServiceProvider.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.AppExtension.CSharp.targets" />
+</Project>
diff --git a/msbuild/tests/MyTVServicesExtension/ServiceProvider.cs b/msbuild/tests/MyTVServicesExtension/ServiceProvider.cs
@@ -0,0 +1,25 @@
+using System;
+using Foundation;
+using TVServices;
+
+namespace MyTVServicesExtension
+{
+	public class ServiceProvider : NSObject, ITVTopShelfProvider
+	{
+		protected ServiceProvider (IntPtr handle) : base (handle)
+		{
+			// Note: this .ctor should not contain any initialization logic.
+		}
+
+		public TVContentItem [] TopShelfItems {
+			[Export ("topShelfItems")]
+			get;
+		}
+
+		public TVTopShelfContentStyle TopShelfStyle {
+			[Export ("topShelfStyle")]
+			get;
+		}
+	}
+}
+
diff --git a/...ild/tests/MyTabbedApplication/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/...ild/tests/MyTabbedApplication/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -94,15 +94,10 @@
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyWatch2Container/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyWatch2Container/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -95,11 +95,6 @@
       "size": "76x76",
       "scale": "2x"
     },
-    {
-      "idiom": "car",
-      "size": "120x120",
-      "scale": "1x"
-    },
     {
       "size": "24x24",
       "idiom": "watch",
@@ -159,4 +154,4 @@
     "version": 1,
     "author": "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyWatchApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyWatchApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -94,15 +94,10 @@
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyWatchApp2/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyWatchApp2/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -95,11 +95,6 @@
       "size" : "76x76",
       "scale" : "2x"
     },
-    {
-      "idiom" : "car",
-      "size" : "120x120",
-      "scale" : "1x"
-    },
     {
       "size" : "24x24",
       "idiom" : "watch",
@@ -167,4 +162,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/msbuild/tests/MyWebViewApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/msbuild/tests/MyWebViewApp/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -94,15 +94,10 @@
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
   }
-}
+}