Merge branch 'main' into xcode13.0-quicklookui-b1

builds/fix-maccatalyst-assembly/Program.cs

@@ -44,4 +44,3 @@ namespace fixcatalystsystemnethttp {
 		}
 	}
 }
-

docs/website/xamarin-analysis-doc-tool/xamarin-analysis-doc.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml.Linq;
 using System.IO;
 

dotnet/HIERARCHY.md

@@ -52,6 +52,8 @@ Files are imported in the following order:
     * targets/Microsoft._platform_.Sdk.targets: contains logic specific to _platform_.
     * targets/Xamarin.Shared.Sdk.DefaultItems.targets: contains logic to enable the
       default behavior we want.
+    * targets/Xamarin.Shared.Sdk.Publish.targets: contains logic to publish the
+      app bundle.
     * targets/Xamarin.Shared.Sdk.targets: all of the build logic shared between all
       platforms.
 

dotnet/Makefile

@@ -25,6 +25,7 @@ $(1)_NUGET_TARGETS = \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.Versions.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.targets \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.DefaultItems.targets \
+	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.Publish.targets \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.TargetFrameworkInference.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.targets \

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/MacCatalystApp1.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-maccatalyst</TargetFramework>
     <RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/SceneDelegate.cs

@@ -52,4 +52,3 @@ public class SceneDelegate : UIResponder, IUIWindowSceneDelegate {
 		// to restore the scene back to its current state.
 	}
 }
-

dotnet/Templates/Microsoft.iOS.Templates/ios/iOSApp1.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-ios</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSApp1</RootNamespace>

dotnet/Templates/Microsoft.iOS.Templates/ioslib/iOSLib1.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-ios</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSLib1</RootNamespace>

dotnet/Templates/Microsoft.macOS.Templates/macos/ViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Visual Studio to store outlets and
 // actions made in the UI designer. If it is removed, they will be lost.

dotnet/Templates/Microsoft.tvOS.Templates/tvos/ViewController.designer.cs

@@ -1,4 +1,4 @@
-//
+//
 // This file has been generated automatically by Visual Studio 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.

dotnet/targets/Xamarin.Shared.Sdk.Publish.targets

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Target Name="_PrePublish">
+		<PropertyGroup>
+			<BuildIpa Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'">true</BuildIpa>
+			<CreatePackage Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</CreatePackage>
+		</PropertyGroup>
+	</Target>
+	<Target Name="Publish" DependsOnTargets="_PrePublish;Build">
+		<Message Importance="high" Text="Created the package: $(IpaPackagePath)" Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'" />
+		<Message Importance="high" Text="Created the package: $(PkgPackagePath)" Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'" />
+	</Target>
+</Project>

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -149,6 +149,9 @@
 	<!-- Default item includes (globs and implicit references) -->
 	<Import Project="Xamarin.Shared.Sdk.DefaultItems.targets" />
 
+	<!-- dotnet publish -->
+	<Import Project="Xamarin.Shared.Sdk.Publish.targets" />
+
 	<!-- This is a hack until we get the TFM values for real from the .NET build logic -->
 	<PropertyGroup>
 		<_TargetFrameworkPlatform Condition="'$(_PlatformName)' == 'iOS'">ios</_TargetFrameworkPlatform>
@@ -416,6 +419,7 @@
 				PartialStaticRegistrarLibrary=$(_LibPartialStaticRegistrar)
 				Platform=$(_PlatformName)
 				PlatformAssembly=$(_PlatformAssemblyName).dll
+				RelativeAppBundlePath=$(_RelativeAppBundlePath)
 				Registrar=$(_BundlerRegistrar)
 				RuntimeConfigurationFile=$(_RuntimeConfigurationFile)
 				SdkDevPath=$(_SdkDevPath)
@@ -466,6 +470,9 @@
 			-->
 			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --disable-opt unusedtypechecks</_ExtraTrimmerArgs>
 
+			<!-- If a release build and the app is not extensible (no interpreter or JIT/code-loading for macOS) then the sealer optimization can be used -->
+			<_ExtraTrimmerArgs Condition="'$(_BundlerDebug)' != 'true' And '$(MtouchInterpreter)' == '' And '$(_RunAotCompiler)' == 'true' And '$(_PlatformName)' != 'macOS'">$(_ExtraTrimmerArgs) --enable-opt sealer</_ExtraTrimmerArgs>
+
 			<!-- We always want the linker to process debug symbols, even when building in Release mode, because the AOT compiler uses the managed debug symbols to output DWARF debugging symbols -->
 			<TrimmerRemoveSymbols Condition="'$(TrimmerRemoveSymbols)' == ''">false</TrimmerRemoveSymbols>
 
@@ -545,7 +552,7 @@
 	</Target>
 
 	<!-- Look in the NativeReference items for frameworks that need to be added to the app bundle, and add all those frameworks to ResolvedFileToPublish (as separate files) -->
-	<Target Name="_ComputeFrameworkFilesToPublish" DependsOnTargets="_ExpandNativeReferences;_ComputeVariables">
+	<Target Name="_ComputeFrameworkFilesToPublish" DependsOnTargets="_ExpandNativeReferences;_ComputeVariables;_LoadLinkerOutput">
 		<ItemGroup>
 			<!-- Expand each framework (which are directories) into all the files in the framework -->
 			<!-- Support a 'CopyToAppBundle' metadata that can be set to 'false' to avoid copying a framework to the app bundle -->
@@ -569,7 +576,7 @@
 	</Target>
 
 	<!-- Look in the NativeReference items for dylibs that need to be added to the app bundle, and add all those frameworks to ResolvedFileToPublish (as separate files) -->
-	<Target Name="_ComputeDynamicLibrariesToPublish" DependsOnTargets="_ExpandNativeReferences;_ComputeVariables">
+	<Target Name="_ComputeDynamicLibrariesToPublish" DependsOnTargets="_ExpandNativeReferences;_ComputeVariables;_LoadLinkerOutput">
 		<ItemGroup>
 			<!-- Support a 'CopyToAppBundle' metadata that can be set to 'false' to avoid copying a framework to the app bundle -->
 			<_DynamicLibraryToPublish Include="@(_FileNativeReference)" Condition="'%(_FileNativeReference.Kind)' == 'Dynamic' And '%(_FileNativeReference.CopyToAppBundle)' != 'false'">
@@ -584,7 +591,7 @@
 		</ItemGroup>
 	</Target>
 
-	<Target Name="_LoadLinkerOutput">
+	<Target Name="_LoadLinkerOutput" DependsOnTargets="ComputeFilesToPublish">
 		<!-- Load _MainFile -->
 		<ReadItemsFromFile SessionId="$(BuildSessionId)" File="$(_LinkerItemsDirectory)/_MainFile.items" Condition="Exists('$(_LinkerItemsDirectory)/_MainFile.items')">
 			<Output TaskParameter="Items" ItemName="_MainFile" />
@@ -625,6 +632,14 @@
 		<ReadItemsFromFile SessionId="$(BuildSessionId)" File="$(_LinkerItemsDirectory)/_AssembliesToAOT.items" Condition="Exists('$(_LinkerItemsDirectory)/_AssembliesToAOT.items')">
 			<Output TaskParameter="Items" ItemName="_AssembliesToAOT" />
 		</ReadItemsFromFile>
+		<!-- Load _FrameworkFilesToPublish -->
+		<ReadItemsFromFile SessionId="$(BuildSessionId)" File="$(_LinkerItemsDirectory)/_FrameworkFilesToPublish.items" Condition="Exists('$(_LinkerItemsDirectory)/_FrameworkFilesToPublish.items')">
+			<Output TaskParameter="Items" ItemName="_FrameworkFilesToPublish" />
+		</ReadItemsFromFile>
+		<!-- Load _DynamicLibraryToPublish -->
+		<ReadItemsFromFile SessionId="$(BuildSessionId)" File="$(_LinkerItemsDirectory)/_DynamicLibraryToPublish.items" Condition="Exists('$(_LinkerItemsDirectory)/_DynamicLibraryToPublish.items')">
+			<Output TaskParameter="Items" ItemName="_DynamicLibraryToPublish" />
+		</ReadItemsFromFile>
 	</Target>
 
 	<!-- Native code -->

msbuild/Messaging/Xamarin.Messaging.Build/Handlers/GetUniversalTargetIdentifierMessageHandler.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;

msbuild/Messaging/Xamarin.Messaging.Build/Handlers/VerifyXcodeVersionMessageHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Xamarin.Messaging.Client;
 using System.Threading.Tasks;
 using Xamarin.MacDev;

msbuild/Messaging/Xamarin.Messaging.Build/Properties/AssemblyInfo.cs

@@ -1,3 +1,3 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo ("Xamarin.Messaging.UnitTests")]

msbuild/Messaging/Xamarin.Messaging.Build/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000

msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>Exe</OutputType>

msbuild/Xamarin.HotRestart.PreBuilt/Xamarin.PreBuilt.iOS/Xamarin.PreBuilt.iOS.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-ios</TargetFramework>
     <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>

msbuild/Xamarin.Mac.Tasks.Core/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

msbuild/Xamarin.Mac.Tasks.Core/Tasks/MmpTaskBase.cs

@@ -1,4 +1,4 @@
-//
+//
 // MmpTask.cs
 //
 // Author:

msbuild/Xamarin.Mac.Tasks.Core/Tasks/XamMacArch.cs

@@ -1,4 +1,4 @@
-//
+//
 // XamMacArch.cs
 //
 // Author:

msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>

msbuild/Xamarin.Mac.Tasks/Tasks/ACTool.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev;
+using Xamarin.MacDev;
 using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks {

msbuild/Xamarin.Mac.Tasks/Tasks/CodesignVerify.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev;
+using Xamarin.MacDev;
 using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks

msbuild/Xamarin.Mac.Tasks/Tasks/CompileAppManifest.cs

@@ -1,4 +1,4 @@
-//
+//
 // CompileAppManifestTask.cs
 //
 // Author:

msbuild/Xamarin.Mac.Tasks/Tasks/CompileSceneKitAssets.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev.Tasks;
+using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks
 {

msbuild/Xamarin.Mac.Tasks/Tasks/CreateEmbeddedResources.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev.Tasks;
+using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks
 {

msbuild/Xamarin.Mac.Tasks/Tasks/DetectSigningIdentity.cs

@@ -1,4 +1,4 @@
-//
+//
 // DetectSigningIdentityTask.cs
 //
 // Author:

msbuild/Xamarin.Mac.Tasks/Tasks/IBTool.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev;
+using Xamarin.MacDev;
 using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks {

msbuild/Xamarin.Mac.Tasks/Tasks/MetalLib.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using Xamarin.MacDev;
 using Xamarin.MacDev.Tasks;
 

msbuild/Xamarin.Mac.Tasks/Tasks/ScnTool.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev.Tasks;
+using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks
 {

msbuild/Xamarin.Mac.Tasks/Tasks/TextureAtlas.cs

@@ -1,4 +1,4 @@
-using Xamarin.MacDev.Tasks;
+using Xamarin.MacDev.Tasks;
 
 namespace Xamarin.Mac.Tasks
 {
@@ -6,4 +6,3 @@ namespace Xamarin.Mac.Tasks
 	{
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/AssetPackUtils.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/BundleResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/CommandLineArgumentBuilder.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 

msbuild/Xamarin.MacDev.Tasks.Core/LinkTarget.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Xamarin.MacDev.Tasks
 {

msbuild/Xamarin.MacDev.Tasks.Core/LinkerOptions.cs

@@ -90,4 +90,3 @@ namespace Xamarin.MacDev.Tasks {
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/LoggingExtensions.cs

@@ -1,4 +1,4 @@
-using Microsoft.Build.Framework;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace Xamarin.MacDev.Tasks

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/CopyBase.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Build.Tasks
+namespace Microsoft.Build.Tasks
 {
 	public abstract class CopyBase : Copy
 	{

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/DeleteBase.cs

@@ -5,4 +5,3 @@ namespace Microsoft.Build.Tasks
 		public string SessionId { get; set; }
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/ExecBase.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Build.Tasks
+namespace Microsoft.Build.Tasks
 {
 	public abstract class ExecBase : Exec
 	{

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/MakeDirBase.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Build.Tasks
+namespace Microsoft.Build.Tasks
 {
 	public abstract class MakeDirBase : MakeDir
 	{

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/MoveTaskBase.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Build.Tasks
+namespace Microsoft.Build.Tasks
 {
 	public abstract class MoveTaskBase : Move
 	{

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/TouchBase.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Build.Tasks
+namespace Microsoft.Build.Tasks
 {
 	public abstract class TouchBase : Touch
 	{

msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/WriteLinesToFileBase.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Build.Tasks
+namespace Microsoft.Build.Tasks
 {
 	public abstract class WriteLinesToFileBase : WriteLinesToFile
 	{

msbuild/Xamarin.MacDev.Tasks.Core/NativeReferenceKind.cs

@@ -1,4 +1,4 @@
-namespace Xamarin.MacDev.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public enum NativeReferenceKind {
 		Static,

msbuild/Xamarin.MacDev.Tasks.Core/PlatformFramework.cs

@@ -1,4 +1,4 @@
-//
+//
 // PlatformFramework.cs
 //
 // Author: Jeffrey Stedfast <jeff@xamarin.com>

msbuild/Xamarin.MacDev.Tasks.Core/PlatformUtils.cs

@@ -1,4 +1,4 @@
-namespace Xamarin.MacDev.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public static class PlatformUtils
 	{

msbuild/Xamarin.MacDev.Tasks.Core/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-//
+//
 // AssemblyInfo.cs
 //
 // Author: Jeffrey Stedfast <jeff@xamarin.com>
@@ -51,4 +51,3 @@ using System.Runtime.CompilerServices;
 //[assembly: AssemblyKeyFile("")]
 
 [assembly: InternalsVisibleTo ("Xamarin.MacDev.Tasks.Tests")]
-

msbuild/Xamarin.MacDev.Tasks.Core/Sdks.cs

@@ -87,4 +87,3 @@ namespace Xamarin.MacDev {
 
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/StringParserService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text.Json;
 using System.Linq;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/AOTCompileTaskBase.cs

@@ -121,4 +121,3 @@ namespace Xamarin.MacDev.Tasks {
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ArToolTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ArchiveTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Diagnostics;
 using System.Linq;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CodesignVerifyTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Specialized;
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectFrameworksBase.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Collections.Generic;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileProductDefinitionTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileSceneKitAssetsTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Diagnostics;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ComputeBundleResourceOutputPathsTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CoreMLCompilerTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CreateAssetPackManifestTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CreateInstallerPackageTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -44,6 +44,9 @@ namespace Xamarin.MacDev.Tasks
 
 		public string PackagingExtraArgs { get ; set; }
 
+		// both input and output
+		[Output]
+		public string PkgPackagePath { get; set; }
 		#endregion
 
 		string GetProjectVersion ()
@@ -109,9 +112,13 @@ namespace Xamarin.MacDev.Tasks
 				}
 			}
 
+			if (string.IsNullOrEmpty (PkgPackagePath)) {
 				string projectVersion = GetProjectVersion ();
 				string target = string.Format ("{0}{1}.pkg", Name, String.IsNullOrEmpty (projectVersion) ? "" : "-" + projectVersion);
-			args.AddQuoted (Path.Combine (OutputDirectory, target));
+				PkgPackagePath = Path.Combine (OutputDirectory, target);
+			}
+			args.AddQuoted (PkgPackagePath);
+
 			return args.ToString ();
 		}
 
@@ -174,4 +181,3 @@ namespace Xamarin.MacDev.Tasks
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CreatePkgInfoTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/DetectSdkLocationCoreTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/DetectSigningIdentityTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/DittoTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/EmbedProvisionProfileTaskBase.cs

@@ -65,4 +65,3 @@ namespace Xamarin.MacDev.Tasks
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/FindItemWithLogicalNameTaskBase.cs

@@ -50,4 +50,3 @@ namespace Xamarin.MacDev.Tasks
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/GetDirectoriesTaskBase.cs

@@ -70,4 +70,3 @@ namespace Xamarin.MacDev.Tasks
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/GetFullPathTaskBase.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/GetMinimumOSVersionTaskBase.cs

@@ -49,4 +49,3 @@ namespace Xamarin.MacDev.Tasks {
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/GetNativeExecutableNameTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/GetPropertyListValueTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/LinkNativeCodeTaskBase.cs

@@ -156,11 +156,6 @@ namespace Xamarin.MacDev.Tasks {
 				arguments.Add (DylibRPath ?? "@executable_path");
 			}
 
-			if (hasEmbeddedFrameworks) {
-				arguments.Add ("-rpath");
-				arguments.Add (FrameworkRPath ?? "@executable_path/Frameworks");
-			}
-
 			if (Frameworks != null) {
 				foreach (var fw in Frameworks) {
 					var is_weak = fw.GetMetadata ("IsWeak") == "true";
@@ -170,12 +165,18 @@ namespace Xamarin.MacDev.Tasks {
 						arguments.Add ("-F");
 						arguments.Add (Path.GetDirectoryName (Path.GetFullPath (framework)));
 						framework = Path.GetFileNameWithoutExtension (framework);
+						hasEmbeddedFrameworks = true;
 					}
 					arguments.Add (is_weak ? "-weak_framework" : "-framework");
 					arguments.Add (framework);
 				}
 			}
 
+			if (hasEmbeddedFrameworks) {
+				arguments.Add ("-rpath");
+				arguments.Add (FrameworkRPath ?? "@executable_path/Frameworks");
+			}
+
 			if (ObjectFiles != null)
 				foreach (var obj in ObjectFiles)
 					arguments.Add (Path.GetFullPath (obj.ItemSpec));
@@ -227,4 +228,3 @@ namespace Xamarin.MacDev.Tasks {
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/MetalLibTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/MetalTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/OptimizePropertyListTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Utilities;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ParseBundlerArgumentsTaskBase.cs

@@ -186,4 +186,3 @@ namespace Xamarin.MacDev.Tasks {
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/PrepareNativeReferencesTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Collections.Generic;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/PrepareResourceRulesTaskBase.cs

@@ -48,4 +48,3 @@ namespace Xamarin.MacDev.Tasks
 		}
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/PropertyListEditorTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Globalization;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ReadItemsFromFileBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ScnToolTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Utilities;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/SmartCopyTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/SpotlightIndexerTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/SymbolStripTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/TextureAtlasTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/WriteItemsToFileBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XamarinTask.cs

@@ -132,4 +132,3 @@ namespace Xamarin.MacDev.Tasks {
 		public bool ShouldExecuteRemotely () => this.ShouldExecuteRemotely (SessionId);
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XamarinToolTask.cs

@@ -76,4 +76,3 @@ namespace Xamarin.MacDev.Tasks {
 		public bool ShouldExecuteRemotely () => this.ShouldExecuteRemotely (SessionId);
 	}
 }
-

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XcodeToolTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Diagnostics;
 using System.ComponentModel;

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ZipTaskBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks.Core/VerbosityUtils.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corp
+// Copyright (c) Microsoft Corp
 
 using System;
 using Microsoft.Build.Framework;

msbuild/Xamarin.MacDev.Tasks/Extensions/IBuildClientExtensions.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Xamarin.Messaging.Ssh;
 
 namespace Xamarin.Messaging.Build.Client {

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Copy.cs

@@ -1,4 +1,4 @@
-using Xamarin.Messaging.Build.Client;
+using Xamarin.Messaging.Build.Client;
 
 namespace Microsoft.Build.Tasks
 {

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Delete.cs

@@ -1,4 +1,4 @@
-using Xamarin.Messaging.Build.Client;
+using Xamarin.Messaging.Build.Client;
 
 namespace Microsoft.Build.Tasks
 {

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Exec.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;