[msbuild] Do not allow iOS and Mac to share the same Xamarin.MacDev* … #2875
There are no files selected for viewing
Submodule Xamarin.MacDev
updated
from f83f84 to 874ef2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| <?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)' == '' ">AnyCPU</Platform> | ||
| <ProductVersion>8.0.30703</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{FDE6C2CD-DF58-4E8f-8F81-E4D05B0B8796}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <RootNamespace>Xamarin.MacDev.Tasks</RootNamespace> | ||
| <AssemblyName>Xamarin.iOSDev.Tasks.Core</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug</OutputPath> | ||
| <DefineConstants>DEBUG;MONO_DATACONVERTER_PUBLIC</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <ConsolePause>false</ConsolePause> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release</OutputPath> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <ConsolePause>false</ConsolePause> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <DefineConstants>MONO_DATACONVERTER_PUBLIC</DefineConstants> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="Microsoft.Build.Engine" /> | ||
| <Reference Include="Microsoft.Build.Framework" /> | ||
| <Reference Include="Microsoft.Build.Tasks.v4.0" /> | ||
| <Reference Include="Microsoft.Build.Utilities.v4.0" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="Mono.Posix" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Json" /> | ||
| <Reference Include="System.Runtime.Serialization" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.iOSDev.csproj"> | ||
| <Project>{78A5AB67-6EC5-4035-8820-337D7D6430AE}</Project> | ||
| <Name>Xamarin.iOSDev</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- XBuild does not define the MSBuildRuntimeVersion property. --> | ||
| <Compile Include="MsBuildTasks\MoveTaskBase.cs" Condition="'$(MSBuildRuntimeVersion)' != ''" /> | ||
| <Compile Include="MsBuildTasks\XBuildMoveTaskBase.cs" Condition="'$(MSBuildRuntimeVersion)' == ''" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="MsBuildTasks\CopyBase.cs" /> | ||
| <Compile Include="MsBuildTasks\DeleteBase.cs" /> | ||
| <Compile Include="MsBuildTasks\ExecBase.cs" /> | ||
| <Compile Include="MsBuildTasks\MakeDirBase.cs" /> | ||
| <Compile Include="MsBuildTasks\RemoveDirBase.cs" /> | ||
| <Compile Include="MsBuildTasks\TouchBase.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="Tasks\ACToolTaskBase.cs" /> | ||
| <Compile Include="Tasks\ArchiveTaskBase.cs" /> | ||
| <Compile Include="Tasks\ArToolTaskBase.cs" /> | ||
| <Compile Include="Tasks\BTouchTaskBase.cs" /> | ||
| <Compile Include="Tasks\CodesignTaskBase.cs" /> | ||
| <Compile Include="Tasks\CodesignVerifyTaskBase.cs" /> | ||
| <Compile Include="Tasks\CompileAppManifestTaskBase.cs" /> | ||
| <Compile Include="Tasks\ComputeBundleResourceOutputPathsTaskBase.cs" /> | ||
| <Compile Include="Tasks\CollectBundleResourcesTaskBase.cs" /> | ||
| <Compile Include="Tasks\CollectFrameworksBase.cs" /> | ||
| <Compile Include="Tasks\CompileEntitlementsTaskBase.cs" /> | ||
| <Compile Include="Tasks\CompileSceneKitAssetsTaskBase.cs" /> | ||
| <Compile Include="Tasks\CreateAssetPackManifestTaskBase.cs" /> | ||
| <Compile Include="Tasks\CreateEmbeddedResourcesTaskBase.cs" /> | ||
| <Compile Include="Tasks\CreateInstallerPackageTaskBase.cs" /> | ||
| <Compile Include="Tasks\CreatePkgInfoTaskBase.cs" /> | ||
| <Compile Include="Tasks\DetectSigningIdentityTaskBase.cs" /> | ||
| <Compile Include="Tasks\DittoTaskBase.cs" /> | ||
| <Compile Include="Tasks\DSymUtilTaskBase.cs" /> | ||
| <Compile Include="Tasks\FindItemWithLogicalNameTaskBase.cs" /> | ||
| <Compile Include="Tasks\GenerateBundleNameTaskBase.cs" /> | ||
| <Compile Include="Tasks\GetNativeExecutableNameTaskBase.cs" /> | ||
| <Compile Include="Tasks\GetPropertyListValueTaskBase.cs" /> | ||
| <Compile Include="Tasks\IBToolTaskBase.cs" /> | ||
| <Compile Include="Tasks\MetalLibTaskBase.cs" /> | ||
| <Compile Include="Tasks\MetalTaskBase.cs" /> | ||
| <Compile Include="Tasks\OptimizePropertyListTaskBase.cs" /> | ||
| <Compile Include="Tasks\PackLibraryResourcesTaskBase.cs" /> | ||
| <Compile Include="Tasks\PrepareNativeReferencesTaskBase.cs" /> | ||
| <Compile Include="Tasks\PropertyListEditorTaskBase.cs" /> | ||
| <Compile Include="Tasks\ScnToolTaskBase.cs" /> | ||
| <Compile Include="Tasks\ReadItemsFromFileBase.cs" /> | ||
| <Compile Include="Tasks\WriteItemsToFileBase.cs" /> | ||
| <Compile Include="Tasks\SmartCopyTaskBase.cs" /> | ||
| <Compile Include="Tasks\SpotlightIndexerTaskBase.cs" /> | ||
| <Compile Include="Tasks\SymbolStripTaskBase.cs" /> | ||
| <Compile Include="Tasks\TextureAtlasTaskBase.cs" /> | ||
| <Compile Include="Tasks\UnpackLibraryResourcesTaskBase.cs" /> | ||
| <Compile Include="Tasks\XcodeCompilerToolTask.cs" /> | ||
| <Compile Include="Tasks\XcodeToolTaskBase.cs" /> | ||
| <Compile Include="Tasks\ZipTaskBase.cs" /> | ||
| <Compile Include="AssetPackUtils.cs" /> | ||
| <Compile Include="BundleResource.cs" /> | ||
| <Compile Include="DataConverter.cs" /> | ||
| <Compile Include="LinkTarget.cs" /> | ||
| <Compile Include="LoggingExtensions.cs" /> | ||
| <Compile Include="NativeReferenceKind.cs" /> | ||
| <Compile Include="PathUtils.cs" /> | ||
| <Compile Include="ProcessArgumentBuilder.cs" /> | ||
| <Compile Include="ProcessUtils.cs" /> | ||
| <Compile Include="StringParserService.cs" /> | ||
| <Compile Include="PlatformFramework.cs" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| <?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)' == '' ">AnyCPU</Platform> | ||
| <ProductVersion>8.0.30703</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <RootNamespace>Xamarin.MacDev.Tasks</RootNamespace> | ||
| <AssemblyName>Xamarin.iOSDev.Tasks</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug</OutputPath> | ||
| <DefineConstants>DEBUG;MONO_DATACONVERTER_PUBLIC</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <ConsolePause>false</ConsolePause> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release</OutputPath> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <ConsolePause>false</ConsolePause> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <DefineConstants>MONO_DATACONVERTER_PUBLIC</DefineConstants> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="Microsoft.Build.Engine" /> | ||
| <Reference Include="Microsoft.Build.Framework" /> | ||
| <Reference Include="Microsoft.Build.Tasks.v4.0" /> | ||
| <Reference Include="Microsoft.Build.Utilities.v4.0" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"> | ||
| <Private>True</Private> | ||
| <HintPath Condition=" Exists('..\..\packages\Mono.Cecil.0.9.5.0\lib\net40\Mono.Cecil.dll') ">..\..\packages\Mono.Cecil.0.9.5.0\lib\net40\Mono.Cecil.dll</HintPath> | ||
|
Contributor
There was a problem hiding this comment. that's also an assembly that can change between versions |
||
| </Reference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.iOSDev.csproj"> | ||
| <Project>{78A5AB67-6EC5-4035-8820-337D7D6430AE}</Project> | ||
| <Name>Xamarin.iOSDev</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Xamarin.MacDev.Tasks.Core\Xamarin.iOSDev.Tasks.Core.csproj"> | ||
| <Project>{FDE6C2CD-DF58-4E8f-8F81-E4D05B0B8796}</Project> | ||
| <Name>Xamarin.iOSDev.Tasks.Core</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="MsBuildTasks\Copy.cs" /> | ||
| <Compile Include="MsBuildTasks\Delete.cs" /> | ||
| <Compile Include="MsBuildTasks\Exec.cs" /> | ||
| <Compile Include="MsBuildTasks\MakeDir.cs" /> | ||
| <Compile Include="MsBuildTasks\Move.cs" /> | ||
| <Compile Include="MsBuildTasks\RemoveDir.cs" /> | ||
| <Compile Include="MsBuildTasks\Touch.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="Tasks\ArTool.cs" /> | ||
| <Compile Include="Tasks\Codesign.cs" /> | ||
| <Compile Include="Tasks\CollectBundleResources.cs" /> | ||
| <Compile Include="Tasks\ComputeBundleResourceOutputPaths.cs" /> | ||
| <Compile Include="Tasks\CreateAssetPackManifest.cs" /> | ||
| <Compile Include="Tasks\CreateInstallerPackage.cs" /> | ||
| <Compile Include="Tasks\CreatePkgInfo.cs" /> | ||
| <Compile Include="Tasks\Ditto.cs" /> | ||
| <Compile Include="Tasks\DSymUtil.cs" /> | ||
| <Compile Include="Tasks\FindItemWithLogicalName.cs" /> | ||
| <Compile Include="Tasks\GenerateBundleName.cs" /> | ||
| <Compile Include="Tasks\GetNativeExecutableName.cs" /> | ||
| <Compile Include="Tasks\GetPropertyListValue.cs" /> | ||
| <Compile Include="Tasks\PackLibraryResources.cs" /> | ||
| <Compile Include="Tasks\PropertyListEditor.cs" /> | ||
| <Compile Include="Tasks\SmartCopy.cs" /> | ||
| <Compile Include="Tasks\SpotlightIndexer.cs" /> | ||
| <Compile Include="Tasks\SymbolStrip.cs" /> | ||
| <Compile Include="Tasks\UnpackLibraryResources.cs" /> | ||
| <Compile Include="Tasks\WriteItemsToFile.cs" /> | ||
| <Compile Include="Tasks\ReadItemsFromFile.cs" /> | ||
| <Compile Include="Tasks\Zip.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="packages.config" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you provide QA a list of tasks that required
Newtonsoft.Json.dllso they can make sure the changes are tested correctly ?