[msbuild] Added support for <Link>'d ImageAsset project files (#1543)
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=28106
This commit is contained in:
Родитель
d7a9bd462a
Коммит
4c5647150c
|
@ -94,7 +94,7 @@ namespace Xamarin.MacDev.Tasks
|
||||||
else
|
else
|
||||||
minimumDeploymentTarget = value.Value;
|
minimumDeploymentTarget = value.Value;
|
||||||
|
|
||||||
var assetDirs = new HashSet<string> (items.Select (x => x.ItemSpec));
|
var assetDirs = new HashSet<string> (items.Select (x => BundleResource.GetVirtualProjectPath (ProjectDir, x, !string.IsNullOrEmpty (SessionId))));
|
||||||
|
|
||||||
if (plist.TryGetValue (ManifestKeys.XSAppIconAssets, out value) && !string.IsNullOrEmpty (value.Value)) {
|
if (plist.TryGetValue (ManifestKeys.XSAppIconAssets, out value) && !string.IsNullOrEmpty (value.Value)) {
|
||||||
int index = value.Value.IndexOf (".xcassets" + Path.DirectorySeparatorChar, StringComparison.Ordinal);
|
int index = value.Value.IndexOf (".xcassets" + Path.DirectorySeparatorChar, StringComparison.Ordinal);
|
||||||
|
@ -242,6 +242,7 @@ namespace Xamarin.MacDev.Tasks
|
||||||
{
|
{
|
||||||
var intermediate = Path.Combine (IntermediateOutputPath, ToolName);
|
var intermediate = Path.Combine (IntermediateOutputPath, ToolName);
|
||||||
var intermediateBundleDir = Path.Combine (intermediate, "bundle");
|
var intermediateBundleDir = Path.Combine (intermediate, "bundle");
|
||||||
|
var intermediateCloneDir = Path.Combine (intermediate, "cloned-assets");
|
||||||
var manifest = new TaskItem (Path.Combine (intermediate, "asset-manifest.plist"));
|
var manifest = new TaskItem (Path.Combine (intermediate, "asset-manifest.plist"));
|
||||||
var bundleResources = new List<ITaskItem> ();
|
var bundleResources = new List<ITaskItem> ();
|
||||||
var outputManifests = new List<ITaskItem> ();
|
var outputManifests = new List<ITaskItem> ();
|
||||||
|
@ -249,6 +250,8 @@ namespace Xamarin.MacDev.Tasks
|
||||||
var unique = new HashSet<string> ();
|
var unique = new HashSet<string> ();
|
||||||
string bundleIdentifier = null;
|
string bundleIdentifier = null;
|
||||||
var knownSpecs = new HashSet<string> ();
|
var knownSpecs = new HashSet<string> ();
|
||||||
|
var clones = new HashSet<string> ();
|
||||||
|
var items = new List<ITaskItem> ();
|
||||||
var specs = new PArray ();
|
var specs = new PArray ();
|
||||||
|
|
||||||
Log.LogTaskName ("ACTool");
|
Log.LogTaskName ("ACTool");
|
||||||
|
@ -291,10 +294,8 @@ namespace Xamarin.MacDev.Tasks
|
||||||
bundleIdentifier = plist.GetCFBundleIdentifier ();
|
bundleIdentifier = plist.GetCFBundleIdentifier ();
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var asset in ImageAssets) {
|
for (int i = 0; i < ImageAssets.Length; i++) {
|
||||||
var vpath = BundleResource.GetVirtualProjectPath (ProjectDir, asset, !string.IsNullOrEmpty(SessionId));
|
var vpath = BundleResource.GetVirtualProjectPath (ProjectDir, ImageAssets[i], !string.IsNullOrEmpty (SessionId));
|
||||||
if (Path.GetFileName (vpath) != "Contents.json")
|
|
||||||
continue;
|
|
||||||
|
|
||||||
// get the parent (which will typically be .appiconset, .launchimage, .imageset, .iconset, etc)
|
// get the parent (which will typically be .appiconset, .launchimage, .imageset, .iconset, etc)
|
||||||
var catalog = Path.GetDirectoryName (vpath);
|
var catalog = Path.GetDirectoryName (vpath);
|
||||||
|
@ -304,15 +305,94 @@ namespace Xamarin.MacDev.Tasks
|
||||||
catalog = Path.GetDirectoryName (catalog);
|
catalog = Path.GetDirectoryName (catalog);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty (catalog)) {
|
if (string.IsNullOrEmpty (catalog)) {
|
||||||
Log.LogWarning (null, null, null, asset.ItemSpec, 0, 0, 0, 0, "Asset not part of an asset catalog: {0}", asset.ItemSpec);
|
Log.LogWarning (null, null, null, items[i].ItemSpec, 0, 0, 0, 0, "Asset not part of an asset catalog: {0}", items[i].ItemSpec);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unique.Add (catalog))
|
if (ImageAssets[i].GetMetadata ("Link") != null) {
|
||||||
catalogs.Add (new TaskItem (catalog));
|
// Note: if any of the files within a catalog are linked, we'll have to clone the *entire* catalog
|
||||||
|
clones.Add (catalog);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// filter out everything except paths containing a Contents.json file since our main processing loop only cares about these
|
||||||
|
if (Path.GetFileName (vpath) != "Contents.json")
|
||||||
|
continue;
|
||||||
|
|
||||||
|
items.Add (ImageAssets[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// clone any *.xcassets dirs that need cloning
|
||||||
|
if (clones.Count > 0) {
|
||||||
|
if (Directory.Exists (intermediateCloneDir))
|
||||||
|
Directory.Delete (intermediateCloneDir, true);
|
||||||
|
|
||||||
|
Directory.CreateDirectory (intermediateCloneDir);
|
||||||
|
|
||||||
|
items.Clear ();
|
||||||
|
|
||||||
|
for (int i = 0; i < ImageAssets.Length; i++) {
|
||||||
|
var vpath = BundleResource.GetVirtualProjectPath (ProjectDir, ImageAssets[i], !string.IsNullOrEmpty (SessionId));
|
||||||
|
var clone = false;
|
||||||
|
ITaskItem item;
|
||||||
|
|
||||||
|
foreach (var catalog in clones) {
|
||||||
|
if (vpath.Length > catalog.Length && vpath[catalog.Length] == '/' && vpath.StartsWith (catalog, StringComparison.Ordinal)) {
|
||||||
|
clone = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (clone) {
|
||||||
|
var path = Path.Combine (intermediateCloneDir, vpath);
|
||||||
|
var dir = Path.GetDirectoryName (path);
|
||||||
|
|
||||||
|
Directory.CreateDirectory (dir);
|
||||||
|
File.Copy (ImageAssets[i].GetMetadata ("FullPath"), path, true);
|
||||||
|
|
||||||
|
// filter out everything except paths containing a Contents.json file since our main processing loop only cares about these
|
||||||
|
if (Path.GetFileName (vpath) != "Contents.json")
|
||||||
|
continue;
|
||||||
|
|
||||||
|
item = new TaskItem (path);
|
||||||
|
ImageAssets[i].CopyMetadataTo (item);
|
||||||
|
item.SetMetadata ("Link", vpath);
|
||||||
|
} else {
|
||||||
|
// filter out everything except paths containing a Contents.json file since our main processing loop only cares about these
|
||||||
|
if (Path.GetFileName (vpath) != "Contents.json")
|
||||||
|
continue;
|
||||||
|
|
||||||
|
item = ImageAssets[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
items.Add (item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note: `items` contains only the Contents.json files at this point
|
||||||
|
for (int i = 0; i < items.Count; i++) {
|
||||||
|
var vpath = BundleResource.GetVirtualProjectPath (ProjectDir, items[i], !string.IsNullOrEmpty (SessionId));
|
||||||
|
var path = items[i].GetMetadata ("FullPath");
|
||||||
|
|
||||||
|
// get the parent (which will typically be .appiconset, .launchimage, .imageset, .iconset, etc)
|
||||||
|
var catalog = Path.GetDirectoryName (vpath);
|
||||||
|
path = Path.GetDirectoryName (path);
|
||||||
|
|
||||||
|
// keep walking up the directory structure until we get to the .xcassets directory
|
||||||
|
while (!string.IsNullOrEmpty (catalog) && Path.GetExtension (catalog) != ".xcassets") {
|
||||||
|
catalog = Path.GetDirectoryName (catalog);
|
||||||
|
path = Path.GetDirectoryName (path);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (unique.Add (catalog)) {
|
||||||
|
var item = new TaskItem (path);
|
||||||
|
item.SetMetadata ("Link", catalog);
|
||||||
|
|
||||||
|
catalogs.Add (item);
|
||||||
|
}
|
||||||
|
|
||||||
if (AppleSdkSettings.XcodeVersion.Major >= 7 && !string.IsNullOrEmpty (bundleIdentifier) && SdkPlatform != "WatchSimulator") {
|
if (AppleSdkSettings.XcodeVersion.Major >= 7 && !string.IsNullOrEmpty (bundleIdentifier) && SdkPlatform != "WatchSimulator") {
|
||||||
var text = File.ReadAllText (asset.ItemSpec);
|
var text = File.ReadAllText (items[i].ItemSpec);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty (text))
|
if (string.IsNullOrEmpty (text))
|
||||||
continue;
|
continue;
|
||||||
|
@ -342,19 +422,19 @@ namespace Xamarin.MacDev.Tasks
|
||||||
var tagList = tags.ToList ();
|
var tagList = tags.ToList ();
|
||||||
tagList.Sort ();
|
tagList.Sort ();
|
||||||
|
|
||||||
var path = AssetPackUtils.GetAssetPackDirectory (intermediate, bundleIdentifier, tagList, out hash);
|
var assetDir = AssetPackUtils.GetAssetPackDirectory (intermediate, bundleIdentifier, tagList, out hash);
|
||||||
|
|
||||||
if (knownSpecs.Add (hash)) {
|
if (knownSpecs.Add (hash)) {
|
||||||
var assetpack = new PDictionary ();
|
var assetpack = new PDictionary ();
|
||||||
var ptags = new PArray ();
|
var ptags = new PArray ();
|
||||||
|
|
||||||
Directory.CreateDirectory (path);
|
Directory.CreateDirectory (assetDir);
|
||||||
|
|
||||||
for (int i = 0; i < tags.Count; i++)
|
for (int j = 0; j < tags.Count; j++)
|
||||||
ptags.Add (new PString (tagList[i]));
|
ptags.Add (new PString (tagList[j]));
|
||||||
|
|
||||||
assetpack.Add ("bundle-id", new PString (string.Format ("{0}.asset-pack-{1}", bundleIdentifier, hash)));
|
assetpack.Add ("bundle-id", new PString (string.Format ("{0}.asset-pack-{1}", bundleIdentifier, hash)));
|
||||||
assetpack.Add ("bundle-path", new PString (Path.GetFullPath (path)));
|
assetpack.Add ("bundle-path", new PString (Path.GetFullPath (assetDir)));
|
||||||
assetpack.Add ("tags", ptags);
|
assetpack.Add ("tags", ptags);
|
||||||
specs.Add (assetpack);
|
specs.Add (assetpack);
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,82 @@
|
||||||
|
//
|
||||||
|
// AppDelegate.cs
|
||||||
|
//
|
||||||
|
// Author: Jeffrey Stedfast <jestedfa@microsoft.com>
|
||||||
|
//
|
||||||
|
// Copyright (c) 2017 Microsoft Corp. (www.microsoft.com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
using Foundation;
|
||||||
|
using UIKit;
|
||||||
|
|
||||||
|
namespace MyLinkedAssets
|
||||||
|
{
|
||||||
|
// The UIApplicationDelegate for the application. This class is responsible for launching the
|
||||||
|
// User Interface of the application, as well as listening (and optionally responding) to application events from iOS.
|
||||||
|
[Register ("AppDelegate")]
|
||||||
|
public class AppDelegate : UIApplicationDelegate
|
||||||
|
{
|
||||||
|
// class-level declarations
|
||||||
|
|
||||||
|
public override UIWindow Window {
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool FinishedLaunching (UIApplication application, NSDictionary launchOptions)
|
||||||
|
{
|
||||||
|
// Override point for customization after application launch.
|
||||||
|
// If not required for your application you can safely delete this method
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnResignActivation (UIApplication application)
|
||||||
|
{
|
||||||
|
// Invoked when the application is about to move from active to inactive state.
|
||||||
|
// This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message)
|
||||||
|
// or when the user quits the application and it begins the transition to the background state.
|
||||||
|
// Games should use this method to pause the game.
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void DidEnterBackground (UIApplication application)
|
||||||
|
{
|
||||||
|
// Use this method to release shared resources, save user data, invalidate timers and store the application state.
|
||||||
|
// If your application supports background exection this method is called instead of WillTerminate when the user quits.
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void WillEnterForeground (UIApplication application)
|
||||||
|
{
|
||||||
|
// Called as part of the transiton from background to active state.
|
||||||
|
// Here you can undo many of the changes made on entering the background.
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnActivated (UIApplication application)
|
||||||
|
{
|
||||||
|
// Restart any tasks that were paused (or not yet started) while the application was inactive.
|
||||||
|
// If the application was previously in the background, optionally refresh the user interface.
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void WillTerminate (UIApplication application)
|
||||||
|
{
|
||||||
|
// Called when the application is about to terminate. Save data, if needed. See also DidEnterBackground.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
|
@ -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>
|
|
@ -0,0 +1,40 @@
|
||||||
|
<?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>CFBundleName</key>
|
||||||
|
<string>MyLinkedAssets</string>
|
||||||
|
<key>CFBundleIdentifier</key>
|
||||||
|
<string>com.your-company.mylinkedassets</string>
|
||||||
|
<key>CFBundleShortVersionString</key>
|
||||||
|
<string>1.0</string>
|
||||||
|
<key>CFBundleVersion</key>
|
||||||
|
<string>1.0</string>
|
||||||
|
<key>LSRequiresIPhoneOS</key>
|
||||||
|
<true/>
|
||||||
|
<key>MinimumOSVersion</key>
|
||||||
|
<string>10.2</string>
|
||||||
|
<key>UIDeviceFamily</key>
|
||||||
|
<array>
|
||||||
|
<integer>1</integer>
|
||||||
|
<integer>2</integer>
|
||||||
|
</array>
|
||||||
|
<key>UILaunchStoryboardName</key>
|
||||||
|
<string>LaunchScreen</string>
|
||||||
|
<key>UIMainStoryboardFile</key>
|
||||||
|
<string>Main</string>
|
||||||
|
<key>UIRequiredDeviceCapabilities</key>
|
||||||
|
<array>
|
||||||
|
<string>armv7</string>
|
||||||
|
</array>
|
||||||
|
<key>UISupportedInterfaceOrientations</key>
|
||||||
|
<array>
|
||||||
|
<string>UIInterfaceOrientationPortrait</string>
|
||||||
|
<string>UIInterfaceOrientationPortraitUpsideDown</string>
|
||||||
|
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||||
|
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||||
|
</array>
|
||||||
|
<key>XSAppIconAssets</key>
|
||||||
|
<string>Assets.xcassets/AppIcon.appiconset</string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
|
||||||
|
<dependencies>
|
||||||
|
<deployment identifier="iOS" />
|
||||||
|
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530" />
|
||||||
|
</dependencies>
|
||||||
|
<scenes>
|
||||||
|
<!--View Controller-->
|
||||||
|
<scene sceneID="EHf-IW-A2E">
|
||||||
|
<objects>
|
||||||
|
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
|
||||||
|
<layoutGuides>
|
||||||
|
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb" />
|
||||||
|
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok" />
|
||||||
|
</layoutGuides>
|
||||||
|
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="600" height="600" />
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
|
||||||
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
|
||||||
|
</view>
|
||||||
|
</viewController>
|
||||||
|
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder" />
|
||||||
|
</objects>
|
||||||
|
<point key="canvasLocation" x="53" y="375" />
|
||||||
|
</scene>
|
||||||
|
</scenes>
|
||||||
|
</document>
|
|
@ -0,0 +1,39 @@
|
||||||
|
//
|
||||||
|
// Main.cs
|
||||||
|
//
|
||||||
|
// Author: Jeffrey Stedfast <jestedfa@microsoft.com>
|
||||||
|
//
|
||||||
|
// Copyright (c) 2017 Microsoft Corp. (www.microsoft.com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
using UIKit;
|
||||||
|
|
||||||
|
namespace MyLinkedAssets
|
||||||
|
{
|
||||||
|
public class Application
|
||||||
|
{
|
||||||
|
// This is the main entry point of the application.
|
||||||
|
static void Main (string[] args)
|
||||||
|
{
|
||||||
|
// if you want to use a different Application Delegate class from "AppDelegate"
|
||||||
|
// you can specify it here.
|
||||||
|
UIApplication.Main (args, null, "AppDelegate");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
|
||||||
|
<dependencies>
|
||||||
|
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106" />
|
||||||
|
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0" />
|
||||||
|
</dependencies>
|
||||||
|
<scenes>
|
||||||
|
<!--View Controller-->
|
||||||
|
<scene sceneID="tne-QT-ifu">
|
||||||
|
<objects>
|
||||||
|
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
|
||||||
|
<layoutGuides>
|
||||||
|
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ" />
|
||||||
|
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE" />
|
||||||
|
</layoutGuides>
|
||||||
|
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="375" height="667" />
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
|
||||||
|
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB" />
|
||||||
|
</view>
|
||||||
|
</viewController>
|
||||||
|
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder" />
|
||||||
|
</objects>
|
||||||
|
</scene>
|
||||||
|
</scenes>
|
||||||
|
</document>
|
|
@ -0,0 +1,135 @@
|
||||||
|
<?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>{440392A2-298D-41CE-8353-59C6CFCE1A2D}</ProjectGuid>
|
||||||
|
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<RootNamespace>MyLinkedAssets</RootNamespace>
|
||||||
|
<AssemblyName>MyLinkedAssets</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;ENABLE_TEST_CLOUD;</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<CodesignKey>iPhone Developer</CodesignKey>
|
||||||
|
<DeviceSpecificBuild>true</DeviceSpecificBuild>
|
||||||
|
<MtouchDebug>true</MtouchDebug>
|
||||||
|
<MtouchFastDev>true</MtouchFastDev>
|
||||||
|
<MtouchUseSGen>true</MtouchUseSGen>
|
||||||
|
<MtouchUseRefCounting>true</MtouchUseRefCounting>
|
||||||
|
<IOSDebuggerPort>47997</IOSDebuggerPort>
|
||||||
|
<MtouchLink>None</MtouchLink>
|
||||||
|
<MtouchArch>i386, x86_64</MtouchArch>
|
||||||
|
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>bin\iPhone\Release</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<CodesignKey>iPhone Developer</CodesignKey>
|
||||||
|
<MtouchUseSGen>true</MtouchUseSGen>
|
||||||
|
<MtouchUseRefCounting>true</MtouchUseRefCounting>
|
||||||
|
<MtouchFloat32>true</MtouchFloat32>
|
||||||
|
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
|
||||||
|
<MtouchLink>SdkOnly</MtouchLink>
|
||||||
|
<MtouchArch>ARMv7, ARM64</MtouchArch>
|
||||||
|
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<CodesignKey>iPhone Developer</CodesignKey>
|
||||||
|
<DeviceSpecificBuild>true</DeviceSpecificBuild>
|
||||||
|
<MtouchUseSGen>true</MtouchUseSGen>
|
||||||
|
<MtouchUseRefCounting>true</MtouchUseRefCounting>
|
||||||
|
<MtouchLink>None</MtouchLink>
|
||||||
|
<MtouchArch>i386, x86_64</MtouchArch>
|
||||||
|
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\iPhone\Debug</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;ENABLE_TEST_CLOUD;</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<CodesignKey>iPhone Developer</CodesignKey>
|
||||||
|
<DeviceSpecificBuild>true</DeviceSpecificBuild>
|
||||||
|
<MtouchDebug>true</MtouchDebug>
|
||||||
|
<MtouchFastDev>true</MtouchFastDev>
|
||||||
|
<MtouchUseSGen>true</MtouchUseSGen>
|
||||||
|
<MtouchUseRefCounting>true</MtouchUseRefCounting>
|
||||||
|
<MtouchFloat32>true</MtouchFloat32>
|
||||||
|
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
|
||||||
|
<MtouchLink>SdkOnly</MtouchLink>
|
||||||
|
<MtouchArch>ARMv7, ARM64</MtouchArch>
|
||||||
|
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
|
||||||
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Xml" />
|
||||||
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="Xamarin.iOS" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Contents.json">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Contents.json</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Icon.png">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Icon.png</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Icon%402x.png">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Icon%402x.png</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Icon-60%402x.png">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Icon-60%402x.png</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Icon-Small.png">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Icon-Small.png</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Icon-Small%402x.png">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Icon-Small%402x.png</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="..\MySingleView\Resources\Images.xcassets\AppIcons.appiconset\Icon-Small-40%402x.png">
|
||||||
|
<Link>Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x.png</Link>
|
||||||
|
</ImageAsset>
|
||||||
|
<ImageAsset Include="Assets.xcassets\Contents.json" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Resources\" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<InterfaceDefinition Include="LaunchScreen.storyboard" />
|
||||||
|
<InterfaceDefinition Include="Main.storyboard" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Info.plist" />
|
||||||
|
<None Include="Entitlements.plist" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Main.cs" />
|
||||||
|
<Compile Include="AppDelegate.cs" />
|
||||||
|
<Compile Include="ViewController.cs" />
|
||||||
|
<Compile Include="ViewController.designer.cs">
|
||||||
|
<DependentUpon>ViewController.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||||
|
</Project>
|
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 2012
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLinkedAssets", "MyLinkedAssets.csproj", "{440392A2-298D-41CE-8353-59C6CFCE1A2D}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|iPhoneSimulator = Debug|iPhoneSimulator
|
||||||
|
Release|iPhone = Release|iPhone
|
||||||
|
Release|iPhoneSimulator = Release|iPhoneSimulator
|
||||||
|
Debug|iPhone = Debug|iPhone
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Release|iPhone.ActiveCfg = Release|iPhone
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Release|iPhone.Build.0 = Release|iPhone
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Debug|iPhone.ActiveCfg = Debug|iPhone
|
||||||
|
{440392A2-298D-41CE-8353-59C6CFCE1A2D}.Debug|iPhone.Build.0 = Debug|iPhone
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
|
@ -0,0 +1,50 @@
|
||||||
|
//
|
||||||
|
// ViewController.cs
|
||||||
|
//
|
||||||
|
// Author: Jeffrey Stedfast <jestedfa@microsoft.com>
|
||||||
|
//
|
||||||
|
// Copyright (c) 2017 Microsoft Corp. (www.microsoft.com)
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
// THE SOFTWARE.
|
||||||
|
using System;
|
||||||
|
|
||||||
|
using UIKit;
|
||||||
|
|
||||||
|
namespace MyLinkedAssets
|
||||||
|
{
|
||||||
|
public partial class ViewController : UIViewController
|
||||||
|
{
|
||||||
|
protected ViewController (IntPtr handle) : base (handle)
|
||||||
|
{
|
||||||
|
// Note: this .ctor should not contain any initialization logic.
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void ViewDidLoad ()
|
||||||
|
{
|
||||||
|
base.ViewDidLoad ();
|
||||||
|
// Perform any additional setup after loading the view, typically from a nib.
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void DidReceiveMemoryWarning ()
|
||||||
|
{
|
||||||
|
base.DidReceiveMemoryWarning ();
|
||||||
|
// Release any cached data, images, etc that aren't in use.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,17 @@
|
||||||
|
//
|
||||||
|
// This file has been generated automatically by MonoDevelop to store outlets and
|
||||||
|
// actions made in the Xcode designer. If it is removed, they will be lost.
|
||||||
|
// Manual changes to this file may not be handled correctly.
|
||||||
|
//
|
||||||
|
using Foundation;
|
||||||
|
|
||||||
|
namespace MyLinkedAssets
|
||||||
|
{
|
||||||
|
[Register ("ViewController")]
|
||||||
|
partial class ViewController
|
||||||
|
{
|
||||||
|
void ReleaseDesignerOutlets ()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,29 @@
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
|
||||||
|
namespace Xamarin.iOS.Tasks
|
||||||
|
{
|
||||||
|
[TestFixture ("iPhone")]
|
||||||
|
[TestFixture ("iPhoneSimulator")]
|
||||||
|
public class LinkedAssets : ProjectTest
|
||||||
|
{
|
||||||
|
static readonly string[] IconNames = { "AppIcon29x29.png", "AppIcon29x29@2x.png", "AppIcon40x40@2x.png", "AppIcon57x57.png", "AppIcon57x57@2x.png", "AppIcon60x60@2x.png" };
|
||||||
|
|
||||||
|
public LinkedAssets (string platform) : base (platform)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void BuildTest ()
|
||||||
|
{
|
||||||
|
BuildProject ("MyLinkedAssets", Platform, "Debug");
|
||||||
|
|
||||||
|
foreach (var name in IconNames) {
|
||||||
|
var path = Path.Combine (AppBundlePath, name);
|
||||||
|
|
||||||
|
Assert.IsTrue (File.Exists (path), "The expected icon `{0}' does not exist.", name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -65,7 +65,7 @@ namespace Xamarin.iOS.Tasks
|
||||||
var coreFiles = GetCoreAppFiles (platform, config, appName + ".exe", appName);
|
var coreFiles = GetCoreAppFiles (platform, config, appName + ".exe", appName);
|
||||||
if (IsTVOS) {
|
if (IsTVOS) {
|
||||||
TestFilesExists (platform == "iPhone" ? Path.Combine (AppBundlePath, ".monotouch-64") : AppBundlePath, coreFiles);
|
TestFilesExists (platform == "iPhone" ? Path.Combine (AppBundlePath, ".monotouch-64") : AppBundlePath, coreFiles);
|
||||||
} else if (platform == "iPhone") {
|
} else {
|
||||||
bool exists = false;
|
bool exists = false;
|
||||||
|
|
||||||
var baseDir = Path.Combine (AppBundlePath, ".monotouch-32");
|
var baseDir = Path.Combine (AppBundlePath, ".monotouch-32");
|
||||||
|
@ -80,8 +80,7 @@ namespace Xamarin.iOS.Tasks
|
||||||
exists = true;
|
exists = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Assert.IsTrue (exists, "No .monotouch-32 or .monotouch-64 directories found");
|
if (!exists)
|
||||||
} else {
|
|
||||||
TestFilesExists (AppBundlePath, coreFiles);
|
TestFilesExists (AppBundlePath, coreFiles);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,6 +109,7 @@
|
||||||
<Compile Include="ProjectsTests\ReleaseBuild.cs" />
|
<Compile Include="ProjectsTests\ReleaseBuild.cs" />
|
||||||
<Compile Include="TaskTests\PropertyListEditorTaskTests.cs" />
|
<Compile Include="TaskTests\PropertyListEditorTaskTests.cs" />
|
||||||
<Compile Include="TaskTests\IBToolTaskTests.cs" />
|
<Compile Include="TaskTests\IBToolTaskTests.cs" />
|
||||||
|
<Compile Include="ProjectsTests\LinkedAssets.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
|
|
Загрузка…
Ссылка в новой задаче