2016-04-21 15:58:45 +03:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
|
|
|
|
<PropertyGroup>
|
|
|
|
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
|
|
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
|
|
|
<ProductVersion>8.0.30703</ProductVersion>
|
|
|
|
|
<SchemaVersion>2.0</SchemaVersion>
|
|
|
|
|
<ProjectGuid>{A737EFCC-4348-4EB1-9C14-4FDC0975388D}</ProjectGuid>
|
|
|
|
|
<OutputType>Exe</OutputType>
|
|
|
|
|
<AssemblyName>mtouch</AssemblyName>
|
|
|
|
|
<RootNamespace>mtouch</RootNamespace>
|
2017-01-24 16:59:05 +03:00
|
|
|
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
2016-04-21 15:58:45 +03:00
|
|
|
</PropertyGroup>
|
|
|
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
|
|
|
<DebugSymbols>True</DebugSymbols>
|
|
|
|
|
<DebugType>full</DebugType>
|
|
|
|
|
<Optimize>False</Optimize>
|
|
|
|
|
<OutputPath>bin\Debug</OutputPath>
|
2016-04-27 22:36:08 +03:00
|
|
|
<DefineConstants>MONOTOUCH;MTOUCH;DEV</DefineConstants>
|
2016-04-21 15:58:45 +03:00
|
|
|
<ErrorReport>prompt</ErrorReport>
|
|
|
|
|
<WarningLevel>4</WarningLevel>
|
|
|
|
|
<ConsolePause>False</ConsolePause>
|
|
|
|
|
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
|
|
|
|
<NoWarn>436</NoWarn>
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
|
|
|
<DebugType>none</DebugType>
|
|
|
|
|
<Optimize>False</Optimize>
|
|
|
|
|
<OutputPath>bin\Release</OutputPath>
|
|
|
|
|
<ErrorReport>prompt</ErrorReport>
|
|
|
|
|
<WarningLevel>4</WarningLevel>
|
|
|
|
|
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
2016-04-27 22:36:08 +03:00
|
|
|
<DefineConstants>MONOTOUCH;MTOUCH;DEV</DefineConstants>
|
2016-04-21 15:58:45 +03:00
|
|
|
</PropertyGroup>
|
2016-04-25 01:49:28 +03:00
|
|
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
2016-04-21 15:58:45 +03:00
|
|
|
<ItemGroup>
|
2016-04-25 14:25:30 +03:00
|
|
|
<Compile Include="Application.cs" />
|
|
|
|
|
<Compile Include="Assembly.cs" />
|
2016-04-21 15:58:45 +03:00
|
|
|
<Compile Include="AssemblyResolver.cs" />
|
2016-04-25 14:25:30 +03:00
|
|
|
<Compile Include="BitcodeConverter.cs" />
|
|
|
|
|
<Compile Include="error.cs" />
|
2016-04-21 15:58:45 +03:00
|
|
|
<Compile Include="mtouch.cs" />
|
2016-04-25 14:25:30 +03:00
|
|
|
<Compile Include="SdkVersions.cs" />
|
|
|
|
|
<Compile Include="Stripper.cs" />
|
|
|
|
|
<Compile Include="Target.cs" />
|
|
|
|
|
<Compile Include="Tuning.cs" />
|
2016-04-21 15:58:45 +03:00
|
|
|
<Compile Include="..\..\external\mono\mcs\class\Mono.Options\Mono.Options\Options.cs">
|
|
|
|
|
<Link>Options.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\build\ios\Constants.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Constants.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\cache.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\cache.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\Extensions.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\Extensions.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\MetadataReducerSubStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\MetadataReducerSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\MonoTouchMarkStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\MonoTouchMarkStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\MonoTouchProfile.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\MonoTouchProfile.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\OptimizeGeneratedCodeSubStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\OptimizeGeneratedCodeSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\PreserveCode.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\PreserveCode.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\RemoveAttributes.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\RemoveAttributes.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\RemoveCode.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\RemoveCode.cs</Link>
|
|
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\XApiReader.cs">
|
|
|
|
|
<Link>Linker\XApiReader.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\Annotations.cs">
|
|
|
|
|
<Link>Linker\Annotations.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\LinkContext.cs">
|
|
|
|
|
<Link>Linker\LinkContext.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\Pipeline.cs">
|
|
|
|
|
<Link>Linker\Pipeline.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\MethodReferenceExtensions.cs">
|
|
|
|
|
<Link>Linker\MethodReferenceExtensions.cs</Link>
|
2017-09-05 21:48:09 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\MarkingHelpers.cs">
|
|
|
|
|
<Link>Linker\Linker\MarkingHelpers.cs</Link>
|
2017-09-05 21:48:09 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\Tracer.cs">
|
|
|
|
|
<Link>Linker\Linker\Tracer.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\TypeReferenceExtensions.cs">
|
|
|
|
|
<Link>Linker\TypeReferenceExtensions.cs</Link>
|
2016-04-25 14:25:30 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\AssemblyResolver.cs">
|
|
|
|
|
<Link>Linker\AssemblyResolver.cs</Link>
|
[runtime] integrate mono 2017-10 (#2905)
* Update the function name used to initialize libmono-profiler-log, its called mono_profiler_init_log () now.
* [builds] Pass --with-cross-offsets= to crosstv's configure.
* Bump mono to 2017-08.
* Bump mono to 2017-08.
* Force disable 'futimens' and 'utimensat' so that we build with Xcode 9.
This is also needed to build with Xcode 8.3 on High Sierra.
* Remove old AppleTls implementation.
* Bump mono.
* Bump mono to 2017-08.
* Bump mono to 2017-08
* Reenable link-keep-resources-2 test
- This reverts commit 76b759ef22c06cda3ba30aba1ac0d45634e4fbf4.
- 2017-08 has linker fix
* Bump mono to 2017-10
* Revert "Bump mono to 2017-10"
This reverts commit bb7832724e18f8578449e46426382a537f3f4823.
* Bump system mono to 2017-10
* Bump embedded mono to 2017-10
* [runtime] reflect eglib move
https://github.com/mono/mono/commit/9be68f8952ea0e1aad582bfe2f47bad71aee2cc7
* bump mono
* [btouch] remove Security.Tls usage from test
* [mtouch tests] update the function name used to initialize libmono-profiler-log, its called mono_profiler_init_log () now.
see
https://github.com/mono/mono/commit/ea4e4a9ef6fc42570a23026adbe826cf7248290e
fixes:
```
1) Failed : Xamarin.MTouch.Profiling(tvOS)
_mono_profiler_startup_log
Expected: collection containing "_mono_profiler_startup_log"
But was: < "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0
2) Failed : Xamarin.MTouch.Profiling(watchOS)
_mono_profiler_startup_log
Expected: collection containing "_mono_profiler_startup_log"
But was: < "_xamarin_get_block_descriptor", "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0
```
* [mmptest] update log profiler options.
https://github.com/mono/mono/commit/826558a4af624bc0acaea98ec39784e65d278091
deprecated the dash prefix for the mlpd path.
`noallocs` or `nocalls` are not needed, neither of them are default anymore.
* [mmptest] fix link-keep-resources-2 test to cope with more corlib resources.
another corlib resource (mscorlib.xml) was added:
https://github.com/mono/mono/commit/11e95169e787#diff-2d1c64decd91d9a6e8842ab0f0e9438d
* Revert "[mmptest] fix link-keep-resources-2 test to cope with more corlib resources."
This reverts commit 350eb3c174288bbffcc3b7acb15cadb913af25b7.
* [XHarness] Add the Mono.Data.Tds tests.
* Address comments from rolf in the review.
* [mmp regresssion tests] bump mono linker, so mscorlib.xml gets stripped
the test was failing in that way:
> Executing link-keep-resources-2...
> [FAIL] i18n 4/2 data files present: charinfo.nlp, collation.core.bin, collation.tailoring.bin, mscorlib.xml
also update the output, because it's actually expected at least three
elements.
fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59277
* bump mono
fixes crash in tvOS: https://github.com/mono/mono/pull/5812
* bump mono for updated BCL tests
see https://github.com/mono/mono/pull/5820
* [mono] set 2017-10 branch in .gitmodules
* [macos] Fix guiunit error on clean builds by depending on correct copy (#2912)
* [macos] Fix guiunit error on clean builds by depending on correct copy
- From a clean build making a BCL test would error due to the non-mobile guiunit not being built
- This was because the Makefile-mac.inc target was incorrect
- This was because xharness assumed that non variation based targets were always Modern
- However, BCL tests are Full, not Modern
* Code review change
* Swap to var to reduce diff
* Revert changes in the paths for GuiUnit.
* [XHarness] Add the System.IO.Compression bcl tests. (#2918)
* [XHarness] Add the System.IO.Compression bcl tests.
* [XHarness] Add bcl tests for System.IO.Compression.FileSystem. (#2924)
* [XHarness] Add the System.IO.Compression bcl tests.
* Ensure that resources are correctly copied in the bundles.
* [XHarness] Add bcl tests for System.IO.Compression.FileSystem.
* As per review, make the Mac test app name match the tests that are ran.
* [XHarness] Add Mono.CSharp tests on ios. (#2927)
* [XHarness] Add Mono.CSharp tests on ios.
* Bump mono to bring changes in the mono.csharp tests.
* [xtro-sharpie] fix TypeDefinition access due to Cecil change
* Bump mono
* bump mono
fixes
- https://bugzilla.xamarin.com/show_bug.cgi?id=60480
- https://bugzilla.xamarin.com/show_bug.cgi?id=60482
* bump mono
more fixes around conflicting paths when tests are run in parallel.
* Bump for mono/mono@2017-10
2017-11-14 23:30:08 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\IXApiVisitor.cs">
|
|
|
|
|
<Link>Linker\IXApiVisitor.cs</Link>
|
[runtime] integrate mono 2017-10 (#2905)
* Update the function name used to initialize libmono-profiler-log, its called mono_profiler_init_log () now.
* [builds] Pass --with-cross-offsets= to crosstv's configure.
* Bump mono to 2017-08.
* Bump mono to 2017-08.
* Force disable 'futimens' and 'utimensat' so that we build with Xcode 9.
This is also needed to build with Xcode 8.3 on High Sierra.
* Remove old AppleTls implementation.
* Bump mono.
* Bump mono to 2017-08.
* Bump mono to 2017-08
* Reenable link-keep-resources-2 test
- This reverts commit 76b759ef22c06cda3ba30aba1ac0d45634e4fbf4.
- 2017-08 has linker fix
* Bump mono to 2017-10
* Revert "Bump mono to 2017-10"
This reverts commit bb7832724e18f8578449e46426382a537f3f4823.
* Bump system mono to 2017-10
* Bump embedded mono to 2017-10
* [runtime] reflect eglib move
https://github.com/mono/mono/commit/9be68f8952ea0e1aad582bfe2f47bad71aee2cc7
* bump mono
* [btouch] remove Security.Tls usage from test
* [mtouch tests] update the function name used to initialize libmono-profiler-log, its called mono_profiler_init_log () now.
see
https://github.com/mono/mono/commit/ea4e4a9ef6fc42570a23026adbe826cf7248290e
fixes:
```
1) Failed : Xamarin.MTouch.Profiling(tvOS)
_mono_profiler_startup_log
Expected: collection containing "_mono_profiler_startup_log"
But was: < "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0
2) Failed : Xamarin.MTouch.Profiling(watchOS)
_mono_profiler_startup_log
Expected: collection containing "_mono_profiler_startup_log"
But was: < "_xamarin_get_block_descriptor", "_mono_profiler_init_log" >
at Xamarin.MTouch.Profiling (Xamarin.Profile profile) [0x00106] in <511889694a624cc9a50e0e9b259b05c5>:0
```
* [mmptest] update log profiler options.
https://github.com/mono/mono/commit/826558a4af624bc0acaea98ec39784e65d278091
deprecated the dash prefix for the mlpd path.
`noallocs` or `nocalls` are not needed, neither of them are default anymore.
* [mmptest] fix link-keep-resources-2 test to cope with more corlib resources.
another corlib resource (mscorlib.xml) was added:
https://github.com/mono/mono/commit/11e95169e787#diff-2d1c64decd91d9a6e8842ab0f0e9438d
* Revert "[mmptest] fix link-keep-resources-2 test to cope with more corlib resources."
This reverts commit 350eb3c174288bbffcc3b7acb15cadb913af25b7.
* [XHarness] Add the Mono.Data.Tds tests.
* Address comments from rolf in the review.
* [mmp regresssion tests] bump mono linker, so mscorlib.xml gets stripped
the test was failing in that way:
> Executing link-keep-resources-2...
> [FAIL] i18n 4/2 data files present: charinfo.nlp, collation.core.bin, collation.tailoring.bin, mscorlib.xml
also update the output, because it's actually expected at least three
elements.
fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59277
* bump mono
fixes crash in tvOS: https://github.com/mono/mono/pull/5812
* bump mono for updated BCL tests
see https://github.com/mono/mono/pull/5820
* [mono] set 2017-10 branch in .gitmodules
* [macos] Fix guiunit error on clean builds by depending on correct copy (#2912)
* [macos] Fix guiunit error on clean builds by depending on correct copy
- From a clean build making a BCL test would error due to the non-mobile guiunit not being built
- This was because the Makefile-mac.inc target was incorrect
- This was because xharness assumed that non variation based targets were always Modern
- However, BCL tests are Full, not Modern
* Code review change
* Swap to var to reduce diff
* Revert changes in the paths for GuiUnit.
* [XHarness] Add the System.IO.Compression bcl tests. (#2918)
* [XHarness] Add the System.IO.Compression bcl tests.
* [XHarness] Add bcl tests for System.IO.Compression.FileSystem. (#2924)
* [XHarness] Add the System.IO.Compression bcl tests.
* Ensure that resources are correctly copied in the bundles.
* [XHarness] Add bcl tests for System.IO.Compression.FileSystem.
* As per review, make the Mac test app name match the tests that are ran.
* [XHarness] Add Mono.CSharp tests on ios. (#2927)
* [XHarness] Add Mono.CSharp tests on ios.
* Bump mono to bring changes in the mono.csharp tests.
* [xtro-sharpie] fix TypeDefinition access due to Cecil change
* Bump mono
* bump mono
fixes
- https://bugzilla.xamarin.com/show_bug.cgi?id=60480
- https://bugzilla.xamarin.com/show_bug.cgi?id=60482
* bump mono
more fixes around conflicting paths when tests are run in parallel.
* Bump for mono/mono@2017-10
2017-11-14 23:30:08 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\ILogger.cs">
|
|
|
|
|
<Link>Linker\ILogger.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\ConsoleLogger.cs">
|
|
|
|
|
<Link>Linker\ConsoleLogger.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\I18nAssemblies.cs">
|
|
|
|
|
<Link>Linker\I18nAssemblies.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\AssemblyAction.cs">
|
|
|
|
|
<Link>Linker\AssemblyAction.cs</Link>
|
[Do not merge yet] Update to mono 2017-04 branch (#1960)
* Update to mono 2017-04 branch
* Patch from Zoltan to fix build error with CppSharp.CppParser.dll
* Include new linker files in Makefile, based on mareks commit
* [msbuild] Fix running bgen for Xamarin.Mac.
bgen must be executed with the system mono, not bmac-mobile-mono, and without
the MONO_PATH variable set.
* System.Data tests should act as if they are running on mobile profile
* Add --runtime=mobile to mono flags in Modern
* Move runtime launcher options up
* System.Data tests should use Mobile profile (mac fix)
* Bump 2017-04 to pick up AOT and assembly resolution fixes
* Build fixes for netstandard.dll and System.Drawing.Primitives.dll
The new handling went in with https://github.com/mono/mono/pull/4501.
I also noticed that WatchOS was missing a target for System.Drawing.Primitives.dll, so I added that.
* Add netstandard.dll to 2.1/Facades and System.Drawing.Primitives.dll to WatchOS
* Fix 2.1/Facades/netstandard.dll build
* Fix the netstandard targets
* Bump mono to latest 2017-04 commit
* [xharness] Fix adding defines to csproj by correctly detecting existing defines.
* Bump mono to latest 2017-04 commit
* [mtouch] Update csproj with new files.
* [mtouch] Improve reporting for MarkExceptions from the linker.
* Bump mono to latest 2017-04 commit
* Bump mono to pick up latest 2017-04 branch commit (Fixes #55436)
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=55436
* Add a missing Makefile dependency
* Chris Hamons patch to apply --runtime=mobile as necessary at AOT time
(It is currently being applied for some configurations at runtime only)
* Bump system mono
* Bump mono for assembly loader changes
* Bump system mono
* Update assemblies list as some where moved to facades
https://github.com/mono/mono/commit/6ca5ec442b494bed8cfb44258c1c73c091ba3122
https://github.com/mono/mono/commit/c38e4d9220b16488e6f8f9e1f05aed4a8af16e62
* Bump mono to latest 2017-04 commit
* Add another new facade
* Bump mono to tip of 2017-04.
* Bump mono to tip of 2017-04.
* [tests][mtouch] Adjust tests to cope with fewer assemblies being included in linked apps. Fixes #56307 and #56308.
System.dll is now completely linked away unless the app actually uses any
System.dll API.
This is the change that caused this to change: https://github.com/mono/mono/commit/4960d5d2a28a08476ee4239e1746f04afce41c13
Previously the following types would always be kept by the linker:
```
$ monodis --typedef System.dll
Typedef Table
1: (null) (flist=1, mlist=1, flags=0x0, extends=0x0)
2: ObjCRuntime.INativeObject (flist=1, mlist=1, flags=0xa0, extends=0x0)
3: Mono.Net.CFObject (flist=1, mlist=2, flags=0x100000, extends=0x5)
4: Mono.Net.CFArray (flist=4, mlist=19, flags=0x100, extends=0xc)
5: Mono.Net.CFNumber (flist=5, mlist=32, flags=0x100100, extends=0xc)
6: Mono.Net.CFRange (flist=5, mlist=41, flags=0x100108, extends=0x25)
7: Mono.Net.CFString (flist=7, mlist=42, flags=0x100100, extends=0xc)
8: Mono.Net.CFData (flist=8, mlist=53, flags=0x100100, extends=0xc)
9: Mono.Net.CFDictionary (flist=8, mlist=63, flags=0x0, extends=0xc)
10: Mono.Net.CFMutableDictionary (flist=10, mlist=75, flags=0x100100, extends=0x24)
11: Mono.Net.CFUrl (flist=10, mlist=80, flags=0x100100, extends=0xc)
12: Mono.Net.CFRunLoop (flist=10, mlist=83, flags=0x100100, extends=0xc)
13: Mono.Net.CFBoolean (flist=10, mlist=94, flags=0x100, extends=0x5)
14: Mono.AppleTls.SecCertificate (flist=13, mlist=106, flags=0x100100, extends=0x5)
15: Mono.AppleTls.SecIdentity (flist=14, mlist=122, flags=0x100, extends=0x5)
16: Mono.AppleTls.SecIdentity/ImportOptions (flist=19, mlist=134, flags=0x100105, extends=0x5)
17: Mono.AppleTls.SecKey (flist=19, mlist=134, flags=0x100100, extends=0x5)
18: Mono.AppleTls.SecStatusCode (flist=21, mlist=141, flags=0x100, extends=0x69)
19: Mono.AppleTls.SecTrustResult (flist=395, mlist=141, flags=0x100, extends=0x69)
20: Mono.AppleTls.SecImportExport (flist=404, mlist=141, flags=0x100100, extends=0x5)
21: Mono.AppleTls.SecImportExport/<>c (flist=404, mlist=144, flags=0x102103, extends=0x5)
22: Mono.AppleTls.SecPolicy (flist=406, mlist=147, flags=0x100100, extends=0x5)
23: Mono.AppleTls.SecTrust (flist=407, mlist=154, flags=0x100100, extends=0x5)
24: System.Security.Cryptography.OidGroup (flist=408, mlist=174, flags=0x101, extends=0x69)
25: System.Security.Cryptography.Oid (flist=420, mlist=174, flags=0x100101, extends=0x5)
26: System.Security.Cryptography.CAPI (flist=423, mlist=176, flags=0x100180, extends=0x5)
27: System.Security.Cryptography.AsnEncodedData (flist=423, mlist=178, flags=0x100101, extends=0x5)
28: System.Security.Cryptography.X509Certificates.X509Utils (flist=424, mlist=179, flags=0x100100, extends=0x5)
29: System.Security.Cryptography.X509Certificates.PublicKey (flist=424, mlist=181, flags=0x100101, extends=0x5)
30: System.Security.Cryptography.X509Certificates.X509Certificate2 (flist=429, mlist=188, flags=0x102101, extends=0x51)
31: System.Security.Cryptography.X509Certificates.X509Certificate2Impl (flist=431, mlist=204, flags=0x100080, extends=0x55)
32: System.Security.Cryptography.X509Certificates.X509CertificateCollection (flist=431, mlist=209, flags=0x102101, extends=0x6d)
33: System.Security.Cryptography.X509Certificates.X509CertificateCollection/X509CertificateEnumerator (flist=431, mlist=212, flags=0x100102, extends=0x5)
34: System.Security.Cryptography.X509Certificates.X509Helper2 (flist=432, mlist=217, flags=0x100180, extends=0x5)
35: <PrivateImplementationDetails> (flist=432, mlist=218, flags=0x100, extends=0x5)
36: <PrivateImplementationDetails>/__StaticArrayInitTypeSize=9 (flist=433, mlist=219, flags=0x113, extends=0x25)
```
Some of the above types from System.dll implemented ObjCRuntime.INativeObject
(from System.dll), which our linker detected as implementing
ObjCRuntime.INativeObject (from Xamarin.iOS.dll), so these types were treated
as custom NSObject subclasses, and the MarkNSObjects linker step would mark
them (which would in turn cause all the other types in the list to be marked).
With that change, these types now implement ObjCRuntimeInternal.INativeObject,
and the linker does not treat them as custom NSObject subclasses anymore.
I think the new behavior is correct: these types do not actually inherit from
the real NSObject/INativeObject, so the linker should not treat them as such.
This may run into different bugs because the linker might now remove more
stuff than before, but that would be a different issue.
This means that the fix is to modify these tests accordingly.
https://bugzilla.xamarin.com/show_bug.cgi?id=56307
https://bugzilla.xamarin.com/show_bug.cgi?id=56308
* Bump mono to latest.
* Fix merge conflict that was missed
* [mtouch] Renumber new error which clashes with an existing error number in master.
2017-05-29 19:39:29 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\TypePreserve.cs">
|
|
|
|
|
<Link>Linker\TypePreserve.cs</Link>
|
[Do not merge yet] Update to mono 2017-04 branch (#1960)
* Update to mono 2017-04 branch
* Patch from Zoltan to fix build error with CppSharp.CppParser.dll
* Include new linker files in Makefile, based on mareks commit
* [msbuild] Fix running bgen for Xamarin.Mac.
bgen must be executed with the system mono, not bmac-mobile-mono, and without
the MONO_PATH variable set.
* System.Data tests should act as if they are running on mobile profile
* Add --runtime=mobile to mono flags in Modern
* Move runtime launcher options up
* System.Data tests should use Mobile profile (mac fix)
* Bump 2017-04 to pick up AOT and assembly resolution fixes
* Build fixes for netstandard.dll and System.Drawing.Primitives.dll
The new handling went in with https://github.com/mono/mono/pull/4501.
I also noticed that WatchOS was missing a target for System.Drawing.Primitives.dll, so I added that.
* Add netstandard.dll to 2.1/Facades and System.Drawing.Primitives.dll to WatchOS
* Fix 2.1/Facades/netstandard.dll build
* Fix the netstandard targets
* Bump mono to latest 2017-04 commit
* [xharness] Fix adding defines to csproj by correctly detecting existing defines.
* Bump mono to latest 2017-04 commit
* [mtouch] Update csproj with new files.
* [mtouch] Improve reporting for MarkExceptions from the linker.
* Bump mono to latest 2017-04 commit
* Bump mono to pick up latest 2017-04 branch commit (Fixes #55436)
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=55436
* Add a missing Makefile dependency
* Chris Hamons patch to apply --runtime=mobile as necessary at AOT time
(It is currently being applied for some configurations at runtime only)
* Bump system mono
* Bump mono for assembly loader changes
* Bump system mono
* Update assemblies list as some where moved to facades
https://github.com/mono/mono/commit/6ca5ec442b494bed8cfb44258c1c73c091ba3122
https://github.com/mono/mono/commit/c38e4d9220b16488e6f8f9e1f05aed4a8af16e62
* Bump mono to latest 2017-04 commit
* Add another new facade
* Bump mono to tip of 2017-04.
* Bump mono to tip of 2017-04.
* [tests][mtouch] Adjust tests to cope with fewer assemblies being included in linked apps. Fixes #56307 and #56308.
System.dll is now completely linked away unless the app actually uses any
System.dll API.
This is the change that caused this to change: https://github.com/mono/mono/commit/4960d5d2a28a08476ee4239e1746f04afce41c13
Previously the following types would always be kept by the linker:
```
$ monodis --typedef System.dll
Typedef Table
1: (null) (flist=1, mlist=1, flags=0x0, extends=0x0)
2: ObjCRuntime.INativeObject (flist=1, mlist=1, flags=0xa0, extends=0x0)
3: Mono.Net.CFObject (flist=1, mlist=2, flags=0x100000, extends=0x5)
4: Mono.Net.CFArray (flist=4, mlist=19, flags=0x100, extends=0xc)
5: Mono.Net.CFNumber (flist=5, mlist=32, flags=0x100100, extends=0xc)
6: Mono.Net.CFRange (flist=5, mlist=41, flags=0x100108, extends=0x25)
7: Mono.Net.CFString (flist=7, mlist=42, flags=0x100100, extends=0xc)
8: Mono.Net.CFData (flist=8, mlist=53, flags=0x100100, extends=0xc)
9: Mono.Net.CFDictionary (flist=8, mlist=63, flags=0x0, extends=0xc)
10: Mono.Net.CFMutableDictionary (flist=10, mlist=75, flags=0x100100, extends=0x24)
11: Mono.Net.CFUrl (flist=10, mlist=80, flags=0x100100, extends=0xc)
12: Mono.Net.CFRunLoop (flist=10, mlist=83, flags=0x100100, extends=0xc)
13: Mono.Net.CFBoolean (flist=10, mlist=94, flags=0x100, extends=0x5)
14: Mono.AppleTls.SecCertificate (flist=13, mlist=106, flags=0x100100, extends=0x5)
15: Mono.AppleTls.SecIdentity (flist=14, mlist=122, flags=0x100, extends=0x5)
16: Mono.AppleTls.SecIdentity/ImportOptions (flist=19, mlist=134, flags=0x100105, extends=0x5)
17: Mono.AppleTls.SecKey (flist=19, mlist=134, flags=0x100100, extends=0x5)
18: Mono.AppleTls.SecStatusCode (flist=21, mlist=141, flags=0x100, extends=0x69)
19: Mono.AppleTls.SecTrustResult (flist=395, mlist=141, flags=0x100, extends=0x69)
20: Mono.AppleTls.SecImportExport (flist=404, mlist=141, flags=0x100100, extends=0x5)
21: Mono.AppleTls.SecImportExport/<>c (flist=404, mlist=144, flags=0x102103, extends=0x5)
22: Mono.AppleTls.SecPolicy (flist=406, mlist=147, flags=0x100100, extends=0x5)
23: Mono.AppleTls.SecTrust (flist=407, mlist=154, flags=0x100100, extends=0x5)
24: System.Security.Cryptography.OidGroup (flist=408, mlist=174, flags=0x101, extends=0x69)
25: System.Security.Cryptography.Oid (flist=420, mlist=174, flags=0x100101, extends=0x5)
26: System.Security.Cryptography.CAPI (flist=423, mlist=176, flags=0x100180, extends=0x5)
27: System.Security.Cryptography.AsnEncodedData (flist=423, mlist=178, flags=0x100101, extends=0x5)
28: System.Security.Cryptography.X509Certificates.X509Utils (flist=424, mlist=179, flags=0x100100, extends=0x5)
29: System.Security.Cryptography.X509Certificates.PublicKey (flist=424, mlist=181, flags=0x100101, extends=0x5)
30: System.Security.Cryptography.X509Certificates.X509Certificate2 (flist=429, mlist=188, flags=0x102101, extends=0x51)
31: System.Security.Cryptography.X509Certificates.X509Certificate2Impl (flist=431, mlist=204, flags=0x100080, extends=0x55)
32: System.Security.Cryptography.X509Certificates.X509CertificateCollection (flist=431, mlist=209, flags=0x102101, extends=0x6d)
33: System.Security.Cryptography.X509Certificates.X509CertificateCollection/X509CertificateEnumerator (flist=431, mlist=212, flags=0x100102, extends=0x5)
34: System.Security.Cryptography.X509Certificates.X509Helper2 (flist=432, mlist=217, flags=0x100180, extends=0x5)
35: <PrivateImplementationDetails> (flist=432, mlist=218, flags=0x100, extends=0x5)
36: <PrivateImplementationDetails>/__StaticArrayInitTypeSize=9 (flist=433, mlist=219, flags=0x113, extends=0x25)
```
Some of the above types from System.dll implemented ObjCRuntime.INativeObject
(from System.dll), which our linker detected as implementing
ObjCRuntime.INativeObject (from Xamarin.iOS.dll), so these types were treated
as custom NSObject subclasses, and the MarkNSObjects linker step would mark
them (which would in turn cause all the other types in the list to be marked).
With that change, these types now implement ObjCRuntimeInternal.INativeObject,
and the linker does not treat them as custom NSObject subclasses anymore.
I think the new behavior is correct: these types do not actually inherit from
the real NSObject/INativeObject, so the linker should not treat them as such.
This may run into different bugs because the linker might now remove more
stuff than before, but that would be a different issue.
This means that the fix is to modify these tests accordingly.
https://bugzilla.xamarin.com/show_bug.cgi?id=56307
https://bugzilla.xamarin.com/show_bug.cgi?id=56308
* Bump mono to latest.
* Fix merge conflict that was missed
* [mtouch] Renumber new error which clashes with an existing error number in master.
2017-05-29 19:39:29 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\LoadException.cs">
|
|
|
|
|
<Link>Linker\LoadException.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\MarkException.cs">
|
|
|
|
|
<Link>Linker\MarkException.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker\MethodAction.cs">
|
|
|
|
|
<Link>Linker\MethodAction.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\BaseStep.cs">
|
|
|
|
|
<Link>Linker.Steps\BaseStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\BlacklistStep.cs">
|
|
|
|
|
<Link>Linker.Steps\BlacklistStep.cs</Link>
|
2016-04-25 14:25:30 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\CleanStep.cs">
|
|
|
|
|
<Link>Linker.Steps\CleanStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\IStep.cs">
|
|
|
|
|
<Link>Linker.Steps\IStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\LoadI18nAssemblies.cs">
|
|
|
|
|
<Link>Linker.Steps\LoadI18nAssemblies.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\LoadReferencesStep.cs">
|
|
|
|
|
<Link>Linker.Steps\LoadReferencesStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\MarkStep.cs">
|
|
|
|
|
<Link>Linker.Steps\MarkStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\OutputStep.cs">
|
|
|
|
|
<Link>Linker.Steps\OutputStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
|
|
|
|
|
<Link>Linker.Steps\ResolveFromAssemblyStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\ResolveFromXApiStep.cs">
|
|
|
|
|
<Link>Linker.Steps\ResolveFromXApiStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\ResolveFromXmlStep.cs">
|
|
|
|
|
<Link>Linker.Steps\ResolveFromXmlStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\ResolveStep.cs">
|
|
|
|
|
<Link>Linker.Steps\ResolveStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\SweepStep.cs">
|
|
|
|
|
<Link>Linker.Steps\SweepStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\external\mono\external\linker\linker\Linker.Steps\TypeMapStep.cs">
|
|
|
|
|
<Link>Linker.Steps\TypeMapStep.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\ApplyPreserveAttributeBase.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\RemoveAttributesBase.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\RemoveAttributesBase.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\PreserveSoapHttpClients.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\Profile.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\Profile.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\CustomizeActions.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\CustomizeActions.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\RemoveResources.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\RemoveResources.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\RemoveSecurity.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\RemoveSecurity.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\Extensions.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\Extensions.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\FixModuleFlags.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\FixModuleFlags.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\Dispatcher.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\Dispatcher.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\MonoTouchSweepStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\MonoTouchSweepStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\ProcessExportedFields.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\ProcessExportedFields.cs</Link>
|
|
|
|
|
</Compile>
|
2017-09-21 23:40:40 +03:00
|
|
|
<Compile Include="..\..\external\mono\external\linker\tuner\Mono.Tuner\CecilRocks.cs">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Link>Mono.Tuner\CecilRocks.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MobileProfile.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MobileProfile.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\BaseProfile.cs">
|
|
|
|
|
<Link>Xamarin.Linker\BaseProfile.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MarkNSObjects.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MarkNSObjects.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\ObjCExtensions.cs">
|
|
|
|
|
<Link>Xamarin.Linker\ObjCExtensions.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\ApplyPreserveAttribute.cs">
|
|
|
|
|
<Link>Xamarin.Linker\ApplyPreserveAttribute.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\CoreMarkStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreMarkStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\CoreRemoveAttributes.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreRemoveAttributes.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MobileExtensions.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MobileExtensions.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MobileMarkStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MobileMarkStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MobileRemoveAttributes.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MobileRemoveAttributes.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\CorePreserveCode.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CorePreserveCode.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MobileSweepStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MobileSweepStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\CoreOptimizeGeneratedCode.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreOptimizeGeneratedCode.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\ObjCRuntime\NativeAttribute.cs">
|
|
|
|
|
<Link>external\maccore\NativeAttribute.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\CoreRemoveSecurity.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreRemoveSecurity.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\CoreHttpMessageHandler.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreHttpMessageHandler.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MobileResolveMainAssemblyStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\MobileResolveMainAssemblyStep.cs</Link>
|
|
|
|
|
</Compile>
|
2018-02-14 11:27:12 +03:00
|
|
|
<Compile Include="..\linker\CoreSweepStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreSweepStep.cs</Link>
|
|
|
|
|
</Compile>
|
2018-02-15 02:44:11 +03:00
|
|
|
<Compile Include="..\linker\CoreTypeMapStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\CoreTypeMapStep.cs</Link>
|
|
|
|
|
</Compile>
|
2016-04-21 15:58:45 +03:00
|
|
|
<Compile Include="..\common\Driver.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Driver.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\TargetFramework.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\TargetFramework.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\StaticRegistrar.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\StaticRegistrar.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\MachO.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\MachO.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\Application.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Application.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\Assembly.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Assembly.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\Target.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Target.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
2017-01-18 11:22:19 +03:00
|
|
|
<Compile Include="..\common\DerivedLinkContext.cs">
|
|
|
|
|
<Link>external\DerivedLinkContext.cs</Link>
|
|
|
|
|
</Compile>
|
2016-04-21 15:58:45 +03:00
|
|
|
<Compile Include="..\common\Frameworks.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Frameworks.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\common\CompilerFlags.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\CompilerFlags.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\ObjCRuntime\RuntimeOptions.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\RuntimeOptions.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\ObjCRuntime\PlatformAvailability2.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\PlatformAvailability2.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\ObjCRuntime\Registrar.core.cs">
|
2016-04-25 14:25:30 +03:00
|
|
|
<Link>external\Registrar.core.cs</Link>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\SealerSubStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\SealerSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\ListExportedSymbols.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\ListExportedSymbols.cs</Link>
|
|
|
|
|
</Compile>
|
2016-04-25 01:49:28 +03:00
|
|
|
<Compile Include="..\..\src\ObjCRuntime\ArgumentSemantic.cs">
|
|
|
|
|
<Link>external\maccore\ArgumentSemantic.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\Foundation\ExportAttribute.cs">
|
|
|
|
|
<Link>external\maccore\ExportAttribute.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\Foundation\ConnectAttribute.cs">
|
|
|
|
|
<Link>external\maccore\ConnectAttribute.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\ObjCRuntime\LinkWithAttribute.cs">
|
|
|
|
|
<Link>external\maccore\LinkWithAttribute.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\PListObject.cs">
|
|
|
|
|
<Link>external\maccore\PListObject.cs</Link>
|
|
|
|
|
</Compile>
|
2016-04-25 14:25:30 +03:00
|
|
|
<Compile Include="..\..\src\ObjCRuntime\Registrar.cs">
|
|
|
|
|
<Link>external\Registrar.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="..\..\src\ObjCRuntime\ErrorHelper.cs">
|
|
|
|
|
<Link>external\ErrorHelper.cs</Link>
|
|
|
|
|
</Compile>
|
2016-05-11 13:47:26 +03:00
|
|
|
<Compile Include="..\..\src\ObjCRuntime\ExceptionMode.cs">
|
|
|
|
|
<Link>external\ExceptionMode.cs</Link>
|
|
|
|
|
</Compile>
|
2016-05-11 14:27:51 +03:00
|
|
|
<Compile Include="..\common\PInvokeWrapperGenerator.cs">
|
|
|
|
|
<Link>common\PInvokeWrapperGenerator.cs</Link>
|
|
|
|
|
</Compile>
|
2016-09-28 18:46:14 +03:00
|
|
|
<Compile Include="..\linker\ExceptionalSubStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\ExceptionalSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
2016-11-01 20:11:25 +03:00
|
|
|
<Compile Include="..\linker\RemoveUserResourcesSubStep.cs">
|
|
|
|
|
<Link>Xamarin.Linker\RemoveUserResourcesSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
[linker] Add an well known candidate inliner substep along with tests (#1513)
TL&DR: This is *how* it should be done and tested, it's not complete
(single, simple case) nor the most interesting case ;-)
The trick is to make sure each case is covered by tests so a mono
_bump_ won't give us a BCL that does not conform to what the linker
expect.
What's the impact ?
1. There is the expected reduction of metadata in mscorlib. Since both
methods don't call other API there's no indirect effect (removal).
--- before 2017-01-15 11:12:44.000000000 -0500
+++ after 2017-01-15 11:12:56.000000000 -0500
@@ -13166,9 +13166,6 @@
System.Void System.Security.SecurityException::.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)
System.Void System.Security.SecurityException::.ctor(System.String)
System.Void System.Security.SecurityException::GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)
-System.Boolean System.Security.SecurityManager::CheckElevatedPermissions()
-System.Security.SecurityManager
-System.Void System.Security.SecurityManager::EnsureElevatedPermissions()
System.Security.SecurityRulesAttribute
System.Security.SecurityRuleSet System.Security.SecurityRulesAttribute::m_ruleSet
System.Void System.Security.SecurityRulesAttribute::.ctor(System.Security.SecurityRuleSet)
2. There is no visible size change (even with #1) in mscorlib.dll due to
padding (compiler /filealign)
mscorlib.dll 793,600 793,600 0 0.00 %
3. there's a *very* small reduction of mscorlib.*.aotdata size
mscorlib.armv7.aotdata 717,264 717,216 -48 -0.01 %
mscorlib.arm64.aotdata 712,840 712,704 -136 -0.02 %
AOT data *.aotdata 6,460,064 6,459,880 -184 0.00 %
4. there's no change in executable size - normal as the AOT compiler has
_likely_ already doing the same optimization (before this commit)
Executable 29,270,272 29,270,272 0 0.00 %
Full comparison: https://gist.github.com/spouliot/0464c8fa3a92b6486dfd90595d9eb718
2017-01-18 05:49:44 +03:00
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\InlinerSubStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\InlinerSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
2017-07-06 11:42:27 +03:00
|
|
|
<Compile Include="..\linker\MonoTouch.Tuner\PreserveSmartEnumConversionsSubStep.cs">
|
|
|
|
|
<Link>MonoTouch.Tuner\PreserveSmartEnumConversionsSubStep.cs</Link>
|
|
|
|
|
</Compile>
|
2017-01-19 14:42:27 +03:00
|
|
|
<Compile Include="..\common\BuildTasks.cs">
|
|
|
|
|
<Link>common\BuildTasks.cs</Link>
|
|
|
|
|
</Compile>
|
|
|
|
|
<Compile Include="BuildTasks.mtouch.cs" />
|
[mtouch] Improve how we make sure native symbols aren't stripped away. Fixes #51710 and #54417. (#2162)
* [mtouch] Improve how we make sure native symbols aren't stripped away. Fixes #51710 and #54417.
* Refactor required symbol collection to store more information about each
symbol (field, function, Objective-C class), and in general make the code
more straight forward.
* Implement support for generating source code that references these symbols,
and do this whenever we can't ask the native linker to keep these symbols
(when using bitcode). Additionally make it possible to do this manually, so
that the source code can be generated for non-bitcode platforms too (which
is useful if the number of symbols is enormous, in which case we might
surpass the maximum command-line length).
* Also make it possible to completely ignore native symbols, or ignore them on
a per-symbol basis. This provides a fallback for users if we get something
right and we try to preserve something that shouldn't be preserved (for
instance if it doesn't exist), and the user ends up with unfixable linker
errors.
* Don't collect Objective-C classes unless they're in an assembly with
LinkWith attributes. We don't need to preserve Objective-C classes in any
other circumstances.
* Implement everything for both Xamarin.iOS and Xamarin.Mac, and share the
code between them.
* Remove previous workaround for bug #51710, since it's no longer needed.
* Add tests.
https://bugzilla.xamarin.com/show_bug.cgi?id=54417
https://bugzilla.xamarin.com/show_bug.cgi?id=51710
* [mtouch] Make sure to only keep symbols from the current app when code sharing.
This fixes a build problem with the interdependent-binding-projects test when
testing in Today Extension mode.
2017-06-02 19:29:19 +03:00
|
|
|
<Compile Include="..\common\Symbols.cs">
|
|
|
|
|
<Link>external\Symbols.cs</Link>
|
|
|
|
|
</Compile>
|
2017-06-06 23:32:25 +03:00
|
|
|
<Compile Include="..\common\StringUtils.cs">
|
|
|
|
|
<Link>StringUtils.cs</Link>
|
|
|
|
|
</Compile>
|
2018-01-13 01:39:38 +03:00
|
|
|
<Compile Include="..\common\CoreResolver.cs">
|
|
|
|
|
<Link>common\CoreResolver.cs</Link>
|
|
|
|
|
</Compile>
|
[mtouch/mmp] Give users more control over optimizations, and share more code between mtouch and mmp. (#3242)
* [mtouch/mmp] Give users more control over optimizations, and share more code between mtouch and mmp.
1. Add an --optimize flag to mtouch/mmp that allows users to select which
optimizations to apply (or not). This makes it easier to add future
optimizations, and allow users to disable any optimization that causes
problems without having to disable many other features.
2. Share as much optimization code as possible between mtouch and mmp. This
immediately gives a benefit to mmp, which has three new optimizations only
mtouch had: NSObject.IsDirectBinding inlining, IntPtr.Size inlining and
dead code elimination.
This results in ~6kb of disk space saved for a linked Xamarin.Mac app:
* link sdk: [Debug][1], [Release][2]
* link all: [Debug][3], [Release][4]
Testing also verifies that monotouchtest ([Debug][5], [Release][6]) has not
changed size at all, which means that no default optimizations have changed
inadvertedly.
[1]: https://gist.github.com/rolfbjarne/6b731e3b5ca6170355662e6505c3d492#link-sdk-mac--debug
[2]: https://gist.github.com/rolfbjarne/6b731e3b5ca6170355662e6505c3d492#link-sdk-mac--release
[3]: https://gist.github.com/rolfbjarne/6b731e3b5ca6170355662e6505c3d492#link-all-mac--debug
[4]: https://gist.github.com/rolfbjarne/6b731e3b5ca6170355662e6505c3d492#link-all-mac--release
[5]: https://gist.github.com/rolfbjarne/6b731e3b5ca6170355662e6505c3d492#monotouchtest-iphonedebug64
[6]: https://gist.github.com/rolfbjarne/6b731e3b5ca6170355662e6505c3d492#monotouchtest-iphonerelease64
* [tools] Don't enable the IsDirectBinding optimization by default for Xamarin.Mac apps, it's not safe.
* Fix whitespace issues.
* [doc] Document optimizations.
* Officially support optimizations by adding them to the Versions.plist.
* [linker] Improve IntPtr.Size inliner + dead code eliminatior and add tests.
* Properly handle operands for the ldc_i4_s instruction (they're sbyte).
* Fix less-than condition to actually do a less-than comparison.
* Make sure to look up the bitness in the Target, not the Application, since
the Application's value will be incorrect when building fat apps (both
Is32Build and Is64Build will be true).
* Remove unnecessary checks for the IntPtr.Size inliner: this optimization
does not depend on other instructions than the IntPtr.get_Size call, so
remove the checks that verify surrounding instructions. This makes the
IntPtr.Size inliner kick in in more scenarios (such as the new tests).
* Add tests.
* [tests] Add mmp tests for optimizations.
* [tests] Fix XM optimization tests.
* [tests] Fix test build error.
2018-01-23 13:33:48 +03:00
|
|
|
<Compile Include="..\common\Optimizations.cs">
|
|
|
|
|
<Link>external\Optimizations.cs</Link>
|
|
|
|
|
</Compile>
|
2018-01-26 20:38:23 +03:00
|
|
|
<Compile Include="..\..\src\ObjCRuntime\BindingImplAttribute.cs">
|
|
|
|
|
<Link>external\maccore\BindingImplAttribute.cs</Link>
|
|
|
|
|
</Compile>
|
2016-04-21 15:58:45 +03:00
|
|
|
</ItemGroup>
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
<Reference Include="System.Core" />
|
|
|
|
|
<Reference Include="System" />
|
|
|
|
|
<Reference Include="System.Xml" />
|
2016-06-28 21:35:05 +03:00
|
|
|
<Reference Include="System.Xml.Linq" />
|
2016-04-21 15:58:45 +03:00
|
|
|
</ItemGroup>
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
<None Include="Makefile" />
|
|
|
|
|
<None Include="monotouch-fixes.c" />
|
|
|
|
|
<None Include="simlauncher.m" />
|
2017-05-19 18:05:38 +03:00
|
|
|
<None Include="..\..\docs\website\mtouch-errors.md">
|
|
|
|
|
<Link>mtouch-errors.md</Link>
|
|
|
|
|
</None>
|
2016-04-21 15:58:45 +03:00
|
|
|
</ItemGroup>
|
|
|
|
|
<ItemGroup>
|
2018-02-15 17:29:58 +03:00
|
|
|
<Folder Include="Linker\" />
|
|
|
|
|
<Folder Include="Linker.Steps\" />
|
2016-04-21 15:58:45 +03:00
|
|
|
<Folder Include="Mono.Tuner\" />
|
|
|
|
|
<Folder Include="MonoTouch.Tuner\" />
|
|
|
|
|
<Folder Include="external\" />
|
|
|
|
|
<Folder Include="external\maccore\" />
|
|
|
|
|
<Folder Include="Xamarin.Linker\" />
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
<ItemGroup>
|
2016-08-24 16:43:35 +03:00
|
|
|
<ProjectReference Include="..\..\external\mono\external\cecil\Mono.Cecil.csproj">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
|
|
|
|
|
<Name>Mono.Cecil</Name>
|
|
|
|
|
</ProjectReference>
|
2016-08-24 16:43:35 +03:00
|
|
|
<ProjectReference Include="..\..\external\mono\external\cecil\symbols\mdb\Mono.Cecil.Mdb.csproj">
|
2016-04-21 15:58:45 +03:00
|
|
|
<Project>{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}</Project>
|
|
|
|
|
<Name>Mono.Cecil.Mdb</Name>
|
|
|
|
|
</ProjectReference>
|
|
|
|
|
</ItemGroup>
|
2017-01-04 00:34:33 +03:00
|
|
|
<Target Name="AfterBuild">
|
|
|
|
|
<Exec Command="make mtouch" />
|
|
|
|
|
</Target>
|
2016-04-21 15:58:45 +03:00
|
|
|
</Project>
|
