Revert "[macOS][msbuild] Fix binding projects under Full to resolve to correct libs (#3672)"
This reverts commit d5b50765f5.
This commit is contained in:
Chris Hamons
Родитель
be4754e9f5
Коммит
9ba23946d1
|
|
@ -12,8 +12,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
|
|||
***********************************************************************************************
|
||||
-->
|
||||
|
||||
<!-- Unlike Xamarin.Mac.Common.targets, which is not shared by the ObjC Bindings targets (yet),
|
||||
Xamarin.Mac.Common.props is shared and truely common. -->
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
|
|
@ -76,42 +74,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
|
|||
<IsMacEnabled>true</IsMacEnabled>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(XamarinMacFrameworkRoot)' == ''">
|
||||
<XamarinMacFrameworkRoot>/Library/Frameworks/Xamarin.Mac.framework/Versions/Current</XamarinMacFrameworkRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<Choose>
|
||||
<When Condition=" '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworkName>Modern</TargetFrameworkName>
|
||||
<MacBclPath>$(XamarinMacFrameworkRoot)/lib/mono/Xamarin.Mac</MacBclPath>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition=" '$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' And '$(UseXamMacFullFramework)' == 'true'">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworkName>Full</TargetFrameworkName>
|
||||
<MacBclPath>$(XamarinMacFrameworkRoot)/lib/mono/4.5</MacBclPath>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<Otherwise>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworkName>System</TargetFrameworkName>
|
||||
<MacBclPath>$(XamarinMacFrameworkRoot)/lib/mono/4.5</MacBclPath>
|
||||
</PropertyGroup>
|
||||
</Otherwise>
|
||||
</Choose>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFrameworkName)' == 'Full'">
|
||||
<AssemblySearchPaths>$(XamarinMacFrameworkRoot)/lib/reference/full;$(XamarinMacFrameworkRoot)/lib/mono;$(AssemblySearchPaths)</AssemblySearchPaths>
|
||||
<ImplicitlyExpandNETStandardFacades>False</ImplicitlyExpandNETStandardFacades>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Do not resolve from the GAC in Modern or Full unless allow-unsafe-gac-resolution is passed in -->
|
||||
<PropertyGroup Condition="'$(TargetFrameworkName)' != 'System' And !$(MonoBundlingExtraArgs.Contains('--allow-unsafe-gac-resolution'))" >
|
||||
<AssemblySearchPaths>$([System.String]::Copy('$(AssemblySearchPaths)').Replace('{GAC}',''))</AssemblySearchPaths>
|
||||
<AssemblySearchPaths Condition="'$(MSBuildRuntimeVersion)' != ''">$(AssemblySearchPaths.Split(';'))</AssemblySearchPaths>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,9 +14,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
***********************************************************************************************
|
||||
-->
|
||||
|
||||
<!-- Xamarin.Mac.Common.targets currently is not shared with Xamarin.Mac.ObjCBinding targets,
|
||||
so be careful not to add fixes here that should go into Xamarin.Mac.Common.props which is shared -->
|
||||
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.ArTool" AssemblyFile="Xamarin.Mac.Tasks.dll" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.Codesign" AssemblyFile="Xamarin.Mac.Tasks.dll" />
|
||||
|
|
@ -63,6 +60,57 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
||||
<PropertyGroup Condition="'$(XamarinMacFrameworkRoot)' == ''">
|
||||
<XamarinMacFrameworkRoot>/Library/Frameworks/Xamarin.Mac.framework/Versions/Current</XamarinMacFrameworkRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<Choose>
|
||||
<When Condition=" '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworkName>Modern</TargetFrameworkName>
|
||||
<MacBclPath>$(XamarinMacFrameworkRoot)/lib/mono/Xamarin.Mac</MacBclPath>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition=" '$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' And '$(UseXamMacFullFramework)' == 'true'">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworkName>Full</TargetFrameworkName>
|
||||
<MacBclPath>$(XamarinMacFrameworkRoot)/lib/mono/4.5</MacBclPath>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<Otherwise>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworkName>System</TargetFrameworkName>
|
||||
<MacBclPath>$(XamarinMacFrameworkRoot)/lib/mono/4.5</MacBclPath>
|
||||
</PropertyGroup>
|
||||
</Otherwise>
|
||||
</Choose>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFrameworkName)' == 'Full'">
|
||||
<AssemblySearchPaths>$(XamarinMacFrameworkRoot)/lib/reference/full;$(XamarinMacFrameworkRoot)/lib/mono;$(AssemblySearchPaths)</AssemblySearchPaths>
|
||||
<ImplicitlyExpandNETStandardFacades>False</ImplicitlyExpandNETStandardFacades>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Do not resolve from the GAC in Modern or Full unless allow-unsafe-gac-resolution is passed in -->
|
||||
<PropertyGroup Condition="'$(TargetFrameworkName)' != 'System' And !$(MonoBundlingExtraArgs.Contains('--allow-unsafe-gac-resolution'))" >
|
||||
<AssemblySearchPaths>$([System.String]::Copy('$(AssemblySearchPaths)').Replace('{GAC}',''))</AssemblySearchPaths>
|
||||
<AssemblySearchPaths Condition="'$(MSBuildRuntimeVersion)' != ''">$(AssemblySearchPaths.Split(';'))</AssemblySearchPaths>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="FixDesignTimeFacades" AfterTargets="GetReferenceAssemblyPaths" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
|
||||
<!-- Location of Libraries -->
|
||||
<Target Name="FixTargetFrameworkDirectory" AfterTargets="FixDesignTimeFacades" Condition="('$(OS)' != 'Windows_NT')">
|
||||
<PropertyGroup>
|
||||
<!-- For Modern / Full we overwrite TargetFrameworkDirectory to resolve non XM assemblies from our location only -->
|
||||
<TargetFrameworkDirectory Condition="'$(TargetFrameworkName)' != 'System'">$(MacBclPath);@(DesignTimeFacadeDirectories)</TargetFrameworkDirectory>
|
||||
|
||||
<!-- For system we extend, not overwrite TargetFrameworkDirectory. -->
|
||||
<!-- mscorlib, System, and other BCL libs must come from Mono System to prevent corlib mistmatches. Xamarin.Mac.dll must come from XM/lib/mono/4.5/ -->
|
||||
<!-- If we find cases of other non-XM assemblies being resolved from XM paths, we can look into using CandidateAssemblyFiles but it is msbuild only. -->
|
||||
<TargetFrameworkDirectory Condition="'$(TargetFrameworkName)' == 'System'">$(TargetFrameworkDirectory);$(MacBclPath)</TargetFrameworkDirectory>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
<PropertyGroup>
|
||||
<_CanOutputAppBundle>False</_CanOutputAppBundle>
|
||||
<_CanOutputAppBundle Condition="'$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true'">true</_CanOutputAppBundle>
|
||||
|
|
@ -651,8 +699,8 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
/>
|
||||
</Target>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.xbuild.targets"
|
||||
Condition="'$(IsXBuild)' == 'true' "/>
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.XM45.xbuild.targets"
|
||||
Condition="'$(UseXamMacFullFramework)' == 'true' And '$(IsXBuild)' == 'true' "/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.msbuild.targets"
|
||||
Condition="'$(IsXBuild)' != 'true' "/>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,25 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<PropertyGroup Condition="'$(OS)' == 'Unix'">
|
||||
<XamarinMacFrameworkRoot Condition="'$(XamarinMacFrameworkRoot)' == '' And Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/bin')">/Library/Frameworks/Xamarin.Mac.framework/Versions/Current</XamarinMacFrameworkRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- If we don't have a specified version/identifier, assume Mobile -->
|
||||
<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v2.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == '' And '$(TargetFrameworkVersion)' == 'v2.0'">Xamarin.Mac</TargetFrameworkIdentifier>
|
||||
|
||||
<BaseLibDllPath Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">$(XamarinMacFrameworkRoot)/lib/mono/Xamarin.Mac/Xamarin.Mac.dll</BaseLibDllPath>
|
||||
<BaseLibDllPath Condition="'$(TargetFrameworkIdentifier)' != 'Xamarin.Mac'">$(XamarinMacFrameworkRoot)/lib/mono/4.5/Xamarin.Mac.dll</BaseLibDllPath>
|
||||
<BTouchToolPath>$(XamarinMacFrameworkRoot)/bin/</BTouchToolPath>
|
||||
<BTouchToolExe Condition="Exists('$(BTouchToolPath)/bgen')">bgen</BTouchToolExe>
|
||||
<BTouchToolExe Condition="!Exists('$(BTouchToolPath)/bgen')">bmac-mobile-mono</BTouchToolExe>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
|
||||
<DefineConstants>__UNIFIED__;__MACOS__;$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,14 +24,18 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.CSharp.props"/>
|
||||
<Import Project="Xamarin.Mac.ObjCBinding.CSharp.props"/>
|
||||
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
<Import Project="Xamarin.Mac.ObjCBinding.Common.targets" />
|
||||
|
||||
<PropertyGroup>
|
||||
<_GeneratedSourcesFileList>$(GeneratedSourcesDir)sources.list</_GeneratedSourcesFileList>
|
||||
<IsXBuild Condition="'$(MSBuildRuntimeVersion)' == ''">true</IsXBuild>
|
||||
<IsXBuild Condition="'$(MSBuildRuntimeVersion)' != ''">false</IsXBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<_GeneratedSourcesFileList>$(GeneratedSourcesDir)\sources.list</_GeneratedSourcesFileList>
|
||||
|
||||
<!-- Add our own pre-build steps -->
|
||||
<CompileDependsOn>
|
||||
|
|
@ -42,6 +46,11 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
</CompileDependsOn>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.XM45.xbuild.targets"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' And '$(IsXBuild)' == 'true' "/>
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.msbuild.targets"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' And '$(IsXBuild)' == 'false' "/>
|
||||
|
||||
<!-- Override the CoreCompile Target to use btouch -->
|
||||
<Target Name="_GenerateBindings"
|
||||
Inputs="$(MSBuildAllProjects);@(ObjcBindingApiDefinition);@(ObjcBindingCoreSource);@(ReferencePath);@(ObjcBindingNativeLibrary)"
|
||||
|
|
@ -60,9 +69,6 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
<Message Text="BTouchEmitDebugInformation: $(BTouchEmitDebugInformation)"/>
|
||||
|
||||
<BTouch
|
||||
SessionId="$(BuildSessionId)"
|
||||
OutputPath="$(OutputPath)"
|
||||
ObjectiveCLibraries="@(ObjcBindingNativeLibrary)"
|
||||
AdditionalLibPaths="$(AdditionalLibPaths)"
|
||||
AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
|
||||
ApiDefinitions="@(ObjcBindingApiDefinition)"
|
||||
|
|
|
|||
|
|
@ -17,24 +17,11 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
|
||||
|
||||
<!-- This is used to determine whether Xamarin.Mac.ObjCBinding.Common.targets needs to import
|
||||
<!-- This is used to determine whether Xamarin.Mac.Common.targets needs to import
|
||||
Xamarin.Mac.ObjCBinding.Common.props itself, or whether it has been imported previously,
|
||||
e.g. by the project itself. -->
|
||||
<PropertyGroup>
|
||||
<_XamarinCommonBindingPropsHasBeenImported>true</_XamarinCommonBindingPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.props"
|
||||
Condition="'$(_XamarinCommonPropsHasBeenImported)' != 'true'" />
|
||||
|
||||
<PropertyGroup>
|
||||
<BaseLibDllPath>$(MacBclPath)/Xamarin.Mac.dll</BaseLibDllPath>
|
||||
<BTouchToolPath>$(XamarinMacFrameworkRoot)/bin/</BTouchToolPath>
|
||||
<BTouchToolExe Condition="Exists('$(BTouchToolPath)/bgen')">bgen</BTouchToolExe>
|
||||
<BTouchToolExe Condition="!Exists('$(BTouchToolPath)/bgen')">bmac-mobile-mono</BTouchToolExe>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
|
||||
<DefineConstants>__UNIFIED__;__MACOS__;$(DefineConstants)</DefineConstants>
|
||||
<_XamarinCommonPropsHasBeenImported>true</_XamarinCommonPropsHasBeenImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- When looking for related files to copy, look for Mono debugging files as well -->
|
||||
|
|
|
|||
|
|
@ -20,16 +20,14 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
|
|||
<UsingTask TaskName="Microsoft.Build.Tasks.RemoveDir" AssemblyFile="Xamarin.Mac.Tasks.dll"/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.Common.props"
|
||||
Condition="'$(_XamarinCommonBindingPropsHasBeenImported)' != 'true'" />
|
||||
Condition="'$(_XamarinCommonPropsHasBeenImported)' != 'true'" />
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.xbuild.targets"
|
||||
Condition="'$(IsXBuild)' == 'true' "/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.msbuild.targets"
|
||||
Condition="'$(IsXBuild)' != 'true' "/>
|
||||
<PropertyGroup Condition="'$(XamarinMacFrameworkRoot)' == ''">
|
||||
<XamarinMacFrameworkRoot>/Library/Frameworks/Xamarin.Mac.framework/Versions/Current</XamarinMacFrameworkRoot>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Add our own pre-build steps -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
<!--
|
||||
***********************************************************************************************
|
||||
Xamarin.Mac.TargetFrameworkFix.targets
|
||||
|
||||
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
|
||||
created a backup copy. Incorrect changes to this file will make it
|
||||
impossible to load or build your projects from the command-line or the IDE.
|
||||
|
||||
This file imports the version- and platform-specific targets for the project importing
|
||||
this file. This file also defines targets to produce an error if the specified targets
|
||||
file does not exist, but the project is built anyway (command-line or IDE build).
|
||||
|
||||
Copyright (c) 2018 Microsoft Corp. (www.microsoft.com)
|
||||
***********************************************************************************************
|
||||
-->
|
||||
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<!-- Hack associated with TargetFrameworkDirectory. Needs to be shared by xbuild and msbuild for now. -->
|
||||
|
||||
<Target Name="FixDesignTimeFacades" AfterTargets="GetReferenceAssemblyPaths" Condition="'$(OS)' != 'Windows_NT'" />
|
||||
|
||||
<!-- Location of Libraries -->
|
||||
<Target Name="FixTargetFrameworkDirectory" AfterTargets="FixDesignTimeFacades" Condition="('$(OS)' != 'Windows_NT')">
|
||||
<PropertyGroup>
|
||||
<!-- For Modern / Full we overwrite TargetFrameworkDirectory to resolve non XM assemblies from our location only -->
|
||||
<TargetFrameworkDirectory Condition="'$(TargetFrameworkName)' != 'System'">$(MacBclPath);@(DesignTimeFacadeDirectories)</TargetFrameworkDirectory>
|
||||
|
||||
<!-- For system we extend, not overwrite TargetFrameworkDirectory. -->
|
||||
<!-- mscorlib, System, and other BCL libs must come from Mono System to prevent corlib mistmatches. Xamarin.Mac.dll must come from XM/lib/mono/4.5/ -->
|
||||
<!-- If we find cases of other non-XM assemblies being resolved from XM paths, we can look into using CandidateAssemblyFiles but it is msbuild only. -->
|
||||
<TargetFrameworkDirectory Condition="'$(TargetFrameworkName)' == 'System'">$(TargetFrameworkDirectory);$(MacBclPath)</TargetFrameworkDirectory>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<DesignTimeFacadeDirectories Remove="@(DesignTimeFacadeDirectories)" />
|
||||
<DesignTimeFacadeDirectories Include="$(MacBclPath)/Facades/" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
||||
|
|
@ -80,12 +80,6 @@
|
|||
<None Include="Xamarin.Mac.msbuild.targets">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Xamarin.Mac.xbuild.targets">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Xamarin.Mac.TargetFrameworkFix.targets">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Xamarin.Mac.Common.targets">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,12 @@ Copyright (c) 2017 Microsoft Corp. (www.microsoft.com)
|
|||
<FrameworkPathOverride Condition="'$(TargetFrameworkName)' != 'System'">$(MacBclPath)</FrameworkPathOverride>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.TargetFrameworkFix.targets"/>
|
||||
<Target Name="FixDesignTimeFacades" AfterTargets="GetReferenceAssemblyPaths" Condition="('$(OS)' != 'Windows_NT')">
|
||||
<ItemGroup>
|
||||
<DesignTimeFacadeDirectories Remove="@(DesignTimeFacadeDirectories)" />
|
||||
<DesignTimeFacadeDirectories Include="$(MacBclPath)/Facades/" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.ImplicitFacade.msbuild.targets" Condition="'$(TargetFrameworkName)' == 'Modern' Or '$(TargetFrameworkName)' == 'Full'"/>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
<!--
|
||||
***********************************************************************************************
|
||||
Xamarin.Mac.xbuild.targets
|
||||
|
||||
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
|
||||
created a backup copy. Incorrect changes to this file will make it
|
||||
impossible to load or build your projects from the command-line or the IDE.
|
||||
|
||||
This file imports the version- and platform-specific targets for the project importing
|
||||
this file. This file also defines targets to produce an error if the specified targets
|
||||
file does not exist, but the project is built anyway (command-line or IDE build).
|
||||
|
||||
Copyright (C) 2015 Xamarin Inc. All rights reserved.
|
||||
***********************************************************************************************
|
||||
-->
|
||||
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.TargetFrameworkFix.targets"/>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.XM45.xbuild.targets"
|
||||
Condition="'$(UseXamMacFullFramework)' == 'true'"/>
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
#if !__WATCHOS__
|
||||
using System.Drawing;
|
||||
#endif
|
||||
|
||||
#if __UNIFIED__
|
||||
using ObjCRuntime;
|
||||
|
|
@ -9,9 +12,6 @@ using AppKit;
|
|||
using UIKit;
|
||||
#endif
|
||||
#else
|
||||
#if !__WATCHOS__
|
||||
using System.Drawing;
|
||||
#endif
|
||||
using MonoTouch.ObjCRuntime;
|
||||
using MonoTouch.Foundation;
|
||||
using MonoTouch.UIKit;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
#if !__WATCHOS__
|
||||
using System.Drawing;
|
||||
#endif
|
||||
|
||||
#if __UNIFIED__
|
||||
using ObjCRuntime;
|
||||
|
|
@ -9,9 +12,6 @@ using AppKit;
|
|||
using UIKit;
|
||||
#endif
|
||||
#else
|
||||
#if !__WATCHOS__
|
||||
using System.Drawing;
|
||||
#endif
|
||||
using MonoTouch.ObjCRuntime;
|
||||
using MonoTouch.Foundation;
|
||||
using MonoTouch.UIKit;
|
||||
|
|
|
|||
|
|
@ -155,7 +155,6 @@ namespace Xamarin.MMP.Tests
|
|||
public string SystemMonoVersion { get; set; } = "";
|
||||
public string TargetFrameworkVersion { get; set; } = "";
|
||||
public Dictionary<string, string> PlistReplaceStrings { get; set; } = new Dictionary<string, string>();
|
||||
public Tuple<string, string> CustomProjectReplacement { get; set; } = null;
|
||||
|
||||
// Binding project specific
|
||||
public string APIDefinitionConfig { get; set; }
|
||||
|
|
@ -272,15 +271,12 @@ namespace Xamarin.MMP.Tests
|
|||
|
||||
static string ProjectTextReplacement (UnifiedTestConfig config, string text)
|
||||
{
|
||||
text = text.Replace ("%CODE%", config.CSProjConfig)
|
||||
return text.Replace ("%CODE%", config.CSProjConfig)
|
||||
.Replace ("%REFERENCES%", config.References)
|
||||
.Replace ("%REFERENCES_BEFORE_PLATFORM%", config.ReferencesBeforePlatform)
|
||||
.Replace ("%NAME%", config.AssemblyName ?? Path.GetFileNameWithoutExtension (config.ProjectName))
|
||||
.Replace ("%ITEMGROUP%", config.ItemGroup)
|
||||
.Replace ("%TARGET_FRAMEWORK_VERSION%", config.TargetFrameworkVersion);
|
||||
if (config.CustomProjectReplacement != null)
|
||||
text = text.Replace (config.CustomProjectReplacement.Item1, config.CustomProjectReplacement.Item2);
|
||||
return text;
|
||||
}
|
||||
|
||||
public static string RunEXEAndVerifyGUID (string tmpDir, Guid guid, string path)
|
||||
|
|
|
|||
|
|
@ -103,7 +103,6 @@
|
|||
<Compile Include="..\..\tools\common\StringUtils.cs">
|
||||
<Link>StringUtils.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="src\BindingProjectTests.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Info.plist" />
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Xamarin.MMP.Tests
|
||||
{
|
||||
public class BindingProjectTests
|
||||
{
|
||||
static string BindingName (bool full) => full ? "XM45Binding" : "MobileBinding";
|
||||
|
||||
static void BuildLinkedTestProjects (string tmpDir, bool full = false, bool removeTFI = false)
|
||||
{
|
||||
string bindingName = BindingName (full);
|
||||
TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) {
|
||||
ProjectName = bindingName + ".csproj",
|
||||
ItemGroup = MMPTests.CreateSingleNativeRef (Path.GetFullPath (MMPTests.SimpleDylibPath), "Dynamic"),
|
||||
StructsAndEnumsConfig = "public class UnifiedWithDepNativeRefLibTestClass {}"
|
||||
};
|
||||
|
||||
if (removeTFI)
|
||||
test.CustomProjectReplacement = new Tuple<string, string> (@"<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>", "");
|
||||
|
||||
string projectPath = TI.GenerateBindingLibraryProject (test);
|
||||
TI.BuildProject (projectPath, true);
|
||||
|
||||
string referenceCode = string.Format (@"<Reference Include=""{0}""><HintPath>{1}</HintPath></Reference>", bindingName, Path.Combine (tmpDir, "bin/Debug", bindingName + ".dll"));
|
||||
|
||||
test = new TI.UnifiedTestConfig (tmpDir) {
|
||||
References = referenceCode,
|
||||
TestCode = "System.Console.WriteLine (typeof (ExampleBinding.UnifiedWithDepNativeRefLibTestClass));",
|
||||
XM45 = full
|
||||
};
|
||||
TI.TestUnifiedExecutable (test);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ShouldRemovePackagedLibrary_OnceInBundle ()
|
||||
{
|
||||
MMPTests.RunMMPTest (tmpDir => {
|
||||
BuildLinkedTestProjects (tmpDir);
|
||||
|
||||
string libPath = Path.Combine (tmpDir, "bin/Debug/UnifiedExample.app/Contents/MonoBundle/MobileBinding.dll");
|
||||
Assert.True (File.Exists (libPath));
|
||||
string monoDisResults = TI.RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/monodis", "--presources " + libPath, "monodis");
|
||||
Assert.IsFalse (monoDisResults.Contains ("SimpleClassDylib.dylib"));
|
||||
});
|
||||
}
|
||||
|
||||
[TestCase (false, false)]
|
||||
[TestCase (true, false)]
|
||||
[TestCase (true, true)]
|
||||
public void ShouldBuildWithoutErrors_AndLinkCorrectFramework (bool full, bool removeTFI)
|
||||
{
|
||||
MMPTests.RunMMPTest (tmpDir => {
|
||||
BuildLinkedTestProjects (tmpDir, full, removeTFI);
|
||||
|
||||
string libPath = Path.Combine (tmpDir, $"bin/Debug/{(full ? "XM45Example.app" : "UnifiedExample.app")}/Contents/MonoBundle/{BindingName (full)}.dll");
|
||||
Assert.True (File.Exists (libPath));
|
||||
string results = TI.RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/monop", "--refs -r:" + libPath, "monop");
|
||||
string mscorlibLine = results.Split (new char[] { '\n' }).First (x => x.Contains ("mscorlib"));
|
||||
|
||||
string expectedVersion = full ? "4.0.0.0" : "2.0.5.0";
|
||||
Assert.True (mscorlibLine.Contains (expectedVersion), $"{mscorlibLine} did not contain expected version {expectedVersion}");
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -561,6 +561,32 @@ namespace Xamarin.MMP.Tests
|
|||
});
|
||||
}
|
||||
|
||||
public void UnifiedWithDepNativeRefLib_ShouldHaveItRemoved_OnceInBundle ()
|
||||
{
|
||||
RunMMPTest (tmpDir =>
|
||||
{
|
||||
TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir)
|
||||
{
|
||||
ProjectName = "MobileBinding.csproj",
|
||||
ItemGroup = string.Format (NativeReferenceTemplate, Path.GetFullPath (SimpleDylibPath), "Dynamic"),
|
||||
StructsAndEnumsConfig = "public class UnifiedWithDepNativeRefLibTestClass {}"
|
||||
};
|
||||
|
||||
string projectPath = TI.GenerateBindingLibraryProject (test);
|
||||
TI.BuildProject (projectPath, true);
|
||||
|
||||
string referenceCode = string.Format (@"<Reference Include=""MobileBinding""><HintPath>{0}</HintPath></Reference>", Path.Combine (tmpDir, "bin/Debug", "MobileBinding.dll"));
|
||||
|
||||
test = new TI.UnifiedTestConfig (tmpDir) { References = referenceCode, TestCode = "System.Console.WriteLine (typeof (ExampleBinding.UnifiedWithDepNativeRefLibTestClass));" };
|
||||
TI.TestUnifiedExecutable (test);
|
||||
|
||||
string libPath = Path.Combine (tmpDir, "bin/Debug/UnifiedExample.app/Contents/MonoBundle/MobileBinding.dll");
|
||||
Assert.True (File.Exists (libPath));
|
||||
string monoDisResults = TI.RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/monodis", new StringBuilder ("--presources " + libPath), "monodis");
|
||||
Assert.IsFalse (monoDisResults.Contains ("SimpleClassDylib.dylib"));
|
||||
});
|
||||
}
|
||||
|
||||
public const string BundleResourceTemplate = "<ItemGroup><BundleResource Include=\"{0}\" /></ItemGroup>";
|
||||
|
||||
[Test]
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ using System.Reflection;
|
|||
namespace Xamarin.MMP.Tests
|
||||
{
|
||||
public partial class MMPTests {
|
||||
public const string ItemGroupTemplate = @"<ItemGroup>{0}</ItemGroup>";
|
||||
public const string NativeReferenceTemplate = @"<NativeReference Include=""{0}""><IsCxx>False</IsCxx><Kind>{1}</Kind></NativeReference>";
|
||||
const string ItemGroupTemplate = @"<ItemGroup>{0}</ItemGroup>";
|
||||
const string NativeReferenceTemplate = @"<NativeReference Include=""{0}""><IsCxx>False</IsCxx><Kind>{1}</Kind></NativeReference>";
|
||||
|
||||
public static string SimpleDylibPath {
|
||||
public string SimpleDylibPath {
|
||||
get {
|
||||
string rootDir = TI.FindRootDirectory ();
|
||||
string buildLibPath = Path.Combine (rootDir, "../tests/mac-binding-project/bin/SimpleClassDylib.dylib");
|
||||
|
|
@ -22,7 +22,7 @@ namespace Xamarin.MMP.Tests
|
|||
}
|
||||
}
|
||||
|
||||
public static string SimpleStaticPath {
|
||||
public string SimpleStaticPath {
|
||||
get {
|
||||
string rootDir = TI.FindRootDirectory ();
|
||||
string buildLibPath = Path.Combine (rootDir, "../tests/mac-binding-project/bin/SimpleClassStatic.a");
|
||||
|
|
@ -31,7 +31,7 @@ namespace Xamarin.MMP.Tests
|
|||
}
|
||||
}
|
||||
|
||||
public static string MobileStaticBindingPath {
|
||||
public string MobileStaticBindingPath {
|
||||
get {
|
||||
string rootDir = TI.FindRootDirectory ();
|
||||
string buildLibPath = Path.Combine (rootDir, "../tests/mac-binding-project/bin/Mobile-static/MobileBinding.dll");
|
||||
|
|
@ -40,9 +40,9 @@ namespace Xamarin.MMP.Tests
|
|||
}
|
||||
}
|
||||
|
||||
public static string CreateNativeRefInclude (string path, string kind) => string.Format (NativeReferenceTemplate, path, kind);
|
||||
public static string CreateItemGroup (IEnumerable<string> elements) => string.Format (ItemGroupTemplate, string.Concat (elements));
|
||||
public static string CreateSingleNativeRef (string path, string kind) => CreateItemGroup (CreateNativeRefInclude (path, kind).FromSingleItem ());
|
||||
string CreateNativeRefInclude (string path, string kind) => string.Format (NativeReferenceTemplate, path, kind);
|
||||
string CreateItemGroup (IEnumerable<string> elements) => string.Format (ItemGroupTemplate, string.Concat (elements));
|
||||
string CreateSingleNativeRef (string path, string kind) => CreateItemGroup (CreateNativeRefInclude (path, kind).FromSingleItem ());
|
||||
|
||||
string CreateCopyOfSimpleClassInTestDir (string tmpDir, string fileName = "SimpleClassDylib.dylib")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -352,6 +352,9 @@ static class C {
|
|||
WriteFrameworkDefines (w);
|
||||
w.AppendLine (@"
|
||||
using System;
|
||||
#if !__WATCHOS__
|
||||
using System.Drawing;
|
||||
#endif
|
||||
|
||||
#if __UNIFIED__
|
||||
using AVFoundation;
|
||||
|
|
@ -374,9 +377,6 @@ using Security;
|
|||
using UIKit;
|
||||
#endif
|
||||
#else
|
||||
#if !__WATCHOS__
|
||||
using System.Drawing;
|
||||
#endif
|
||||
using MonoTouch.ObjCRuntime;
|
||||
using MonoTouch.Foundation;
|
||||
using MonoTouch.UIKit;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче