Alexander Köplinger
247a6bf551
Switch to mono archive and remove submodule
2019-05-21 22:16:02 +02:00
Alexander Köplinger
824174ab35
Revert "Revert "[builds] Make the tools build use mono's packaged logic instead of our own. ( #5962 )" ( #5971 )"
...
This reverts commit cb1ead3bed
.
2019-05-21 22:16:02 +02:00
Rolf Bjarne Kvinge
835daf1f60
Merge remote-tracking branch 'origin/master' into arm64_32-v3
2019-05-21 07:53:23 +02:00
Rolf Bjarne Kvinge
6b1d01535e
Bump mono.
...
New commits in mono/mono:
* mono/mono@16c6ac81b3 [interp] disable inlining for built-in types (#14531 )
Diff: 1ce13bb09d..16c6ac81b3
2019-05-21 07:44:59 +02:00
Manuel de la Pena
b8824524b2
[XHarness] Remove the old style bcl tests. ( #6083 )
2019-05-20 16:58:45 -07:00
Rolf Bjarne Kvinge
a9372793a7
Merge remote-tracking branch 'origin/master' into arm64_32-v3
2019-05-20 18:45:19 +02:00
Rolf Bjarne Kvinge
b53e39ab36
Bump mono.
...
New commits in mono/mono:
* mono/mono@1ce13bb09d [arm] one more attempt to fix slotsize issue on llvmonly (#14444 ) (#14535 )
* mono/mono@bb3c9db497 [2019-02] [monodroid] Introduce 'win32 host' BCL build (#14504 )
* mono/mono@ca17767758 [sdks] Set PATH in Android Windows SDK pipeline job (#14519 )
* mono/mono@1cb80e7ecf [sdks] Set win-amd64 CI_TAGS for windows pipeline step (#14516 )
* mono/mono@c857c27d2e [2019-02][sdks] Build Android SDK on Windows (#14472 )
* mono/mono@ab378434b9 [2019-02][ci] Add Android Windows (Release) archive job to pipeline (#14503 )
* mono/mono@06c3f55312 [sdks] Lipo arm64_32 binaries for watchOS
* mono/mono@0f69e27153 [sdks] Use -pathmap CSC option for iOS/Mac
* mono/mono@69fae70242 [WinForms] Related Forms closing issue (#13717 )
* mono/mono@4fa246df3f [2019-02] [WinForms] fix EditingCellFormattedValue getter and setter for bool value (#14437 )
* mono/mono@a55d1c9377 [2019-02] TextInfo.ChangeCase should not use CultureInfo.CurrentCulture (#14438 )
* mono/mono@b41578079e [2019-02] Revert "[System] Add FSEvent FileSystemWatcher to monotouch BCL profile" (#14448 )
* mono/mono@09429597dc [metadata] use handle stack in mono_runtime_object_init_handle (#14445 )
* mono/mono@77ddc3abc1 [arm64] set MONO_ARCH_HAVE_UNWIND_BACKTRACE for watch4 (#14452 )
Diff: f1aa58d9a9..1ce13bb09d
2019-05-20 18:43:39 +02:00
Manuel de la Pena
4db4e09e7e
[Xharness] Add support to pass extra arguments to the test bcl apps. ( #6082 )
...
Allow to add extra mtouch arguments to the bcl test applications to configure them. This will allow to pass required specific settings that some tests have, for example, for the linker.
2019-05-20 09:35:22 -07:00
Rolf Bjarne Kvinge
5b4b398ae6
[tests] Link NUnit/XUnit watchOS extensions.
...
Makes them much smaller.
2019-05-20 18:00:18 +02:00
Rolf Bjarne Kvinge
21b8690818
[tests] Fix reporting back to xharness for watchOS NUnit/XUnit tests.
...
* Choose the first hostname for the HttpTextWriter if there are multiple hosts.
* Open the HttpTextWriter before writing to it.
* Don't overwrite the http writer with another writer immediately after creating it.
* Close the HttpTextWriter when done writing.
* Wait for the HttpTextWriter to complete the final http request before exiting.
2019-05-20 18:00:18 +02:00
Rolf Bjarne Kvinge
eab32da266
[monotouch-test] Don't go completely overboard when trying to fill the GC's nursery.
2019-05-20 18:00:18 +02:00
Rolf Bjarne Kvinge
1e31ea2f83
Fix whitespace.
2019-05-20 18:00:18 +02:00
Manuel de la Pena
94fe39b118
[XHarness] Do use the test dlls from the mono downloads. ( #6055 )
...
This updates the project generation. We cannot yet fully remove the submodule because:
* We are missing the xunit dlls which should be added in the SDK.
* We have not yet remove all the old style tests. Would make the PR huge, better to deal with it in a diff PR.
* The xunit CoreLib tests have issues loading all the tests, needs some extra work and again, the PR is already large.
Fixes : xamarin/maccore#1199
Fixes : xamarin/maccore#1204
Fixes : xamarin/maccore#1209
Fixes : xamarin/maccore#1510
2019-05-19 14:55:14 -07:00
Rolf Bjarne Kvinge
2d34cb259b
Merge remote-tracking branch 'origin/master' into arm64_32-v3
2019-05-17 14:53:15 -07:00
Rolf Bjarne Kvinge
6ff6d313a2
[xharness] Don't run monotouch-test/interpreter for now. ( #6067 )
...
Works around https://github.com/xamarin/maccore/issues/1613 .
2019-05-17 14:48:31 -07:00
Rolf Bjarne Kvinge
6b650d8364
[sample tests] Fix variable calculation to calculate once. ( #6061 )
...
Use simply expanded variable as test result filename, so that it's only
calculated once. This avoids ending up with different filenames when the
timestamp in the filename changes between calculations, such as:
Results (nunit3) saved as /Users/vsts/agent/2.150.3/work/1/s/tests/sampletester/TestResult-20190511-100657.xml
warning: failed to load external entity "TestResult-20190511-100658.xml"
unable to parse TestResult-20190511-100658.xml
make: *** [run-tests] Error 6
2019-05-17 09:21:00 -07:00
Ankit Jain
7dddfb657c
[xibuild] Fix incorrect mscorlib.dll being used ( #6068 )
...
* [xibuild] Fix incorrect mscorlib.dll being used
The `GuiUnit_NET_4_5` project, when built with `xibuild` uses the wrong `mscorlib.dll`.
From https://github.com/xamarin/xamarin-macios/issues/5760#issuecomment-472457202 :
```
- mscorlib.dll is being used from mono/4.5 and the other system assemblies are from mono/4.5-api
- GuiNet* project is built with xibuild
What is happening here is:
xibuild sets[1] `SetToolsetProperty ("TargetFrameworkRootPath", FrameworksDirectory + Path.DirectorySeparatorChar);`
which points to `/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks`.
This causes $(FrameworkPathOverride) to be set[2] to `/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks/.NETFramework/v4.5`,
but that doesn't have a mscorlib.dll, so it gets reset[3] to /Library/Frameworks/Mono.framework/Versions/5.22.0/lib/mono/4.5/.
If we don't set TargetFrameworkRoothPath, then we get `FrameworkPathOverride = /Library/Frameworks/Mono.framework/Versions/5.22.0/lib/mono/4.5-api`,
causing `_ExplicitReference=/Library/Frameworks/Mono.framework/Versions/5.22.0/lib/mono/4.5-api/mscorlib.dll`(correct one) to be used.
```
Fixes https://github.com/xamarin/xamarin-macios/issues/5760
1. https://github.com/xamarin/xamarin-macios/blob/master/tools/xibuild/Main.cs#L209
2. https://github.com/mono/msbuild/blob/xplat-master/src/Tasks/Microsoft.Common.CurrentVersion.targets#L79
3. https://github.com/mono/msbuild/blob/xplat-master/src/Tasks/Microsoft.Common.CurrentVersion.targets#L84
* Revert "Workaround https://github.com/xamarin/xamarin-macios/issues/5760 in generator csproj"
This reverts commit 9bd927bb7f
.
The previous commit for xibuild removes the need for this.
2019-05-17 09:12:05 -07:00
Rolf Bjarne Kvinge
d84c3a0892
[xharness] 'Skipped' really meant 'DeviceNotFound', so rename things to avoid confusion. ( #6066 )
2019-05-17 08:59:33 -07:00
Manuel de la Pena
a1c19733d8
[XHarness] Ignore corlib on tvOS until mono fixes the test dlls. ( #6063 )
...
Test dlls are wrong so we will ignore them until mono fixes them.
Fixes: https://github.com/xamarin/maccore/issues/1611
Mono issue: https://github.com/mono/mono/issues/14497
2019-05-17 08:41:18 -07:00
Rolf Bjarne Kvinge
47beab425d
Merge remote-tracking branch 'origin/master' into arm64_32-v3
2019-05-16 15:26:15 -07:00
Rolf Bjarne Kvinge
b6f735c26b
[xharness] Rework arm64_32 variations a bit so that they're not always enabled.
...
We don't want to try to run arm64_32 tests on bots that don't have devices
attached, so make sure they follow the logic of other device tests.
2019-05-16 15:24:51 -07:00
Chris Hamons
155bb924de
Revert "[launcher] Pass --use-map-jit to mono on XM app startup" ( #6051 )
...
- This reverts commit 2278512aba
.
- This is no longer necessary due to https://github.com/mono/mono/pull/14395
2019-05-16 15:09:02 -07:00
Sebastien Pouliot
5fbf721957
[mmp] Fix compiler warning ( #6064 )
...
```
Tuning.cs(300,8): warning CS0108: 'LoadOptionalReferencesStep.ProcessReferences(AssemblyDefinition)' hides inherited member 'LoadReferencesStep.ProcessReferences(AssemblyDefinition)'. Use the new keyword if hiding was intended. [/Users/poupou/git/master/xamarin-macios/tools/mmp/mmp.csproj]
```
it's not virtual and it's not being called back annyway.
2019-05-16 16:44:08 -05:00
Manuel de la Pena
eb64b377bb
[Xharness] Remove the System bcl tests on tvOS ( #6062 )
...
Until mono fixes the test dlls, we are ignoring the tests.
Silences: https://github.com/xamarin/maccore/issues/1610
2019-05-16 13:07:38 -07:00
Manuel de la Pena
c9692c8e34
[XHarness] Support binlogs for the tests projects. Fixes #1604 ( #6056 )
...
Generate binlogs to ensure that we can easily debug msbuild failures.
2019-05-16 13:06:44 -07:00
Manuel de la Pena
f2948b268e
[XHarness] Show when we have a watch HE0038 error. ( #6060 )
...
To simplify the life of the monitorer, if we get a crash with a HE0038
we will propagate the result to the html and will provide a link to the
issue so that it is easy to report it.
2019-05-16 13:05:19 -07:00
Sebastien Pouliot
4cfca09260
[foundation] Expose AllowsCellularAccess on NSUrlSessionHandler ( #6059 )
...
This property was always set to `true` but it can be useful to turn it
off (and that was not easy with the existing implementation)
2019-05-16 14:20:06 -05:00
Manuel de la Pena
762146a95c
[XHarness] Ignore IO flacky tests in devices too. ( #6057 )
2019-05-16 10:15:11 -07:00
Sebastien Pouliot
2121b703cd
[linker] Add the custom attributes removal step as an configurable optimization. Fix #3655 ( #6049 )
...
This allows the optimization to be disabled in cases where one, or
many, a custom attribute(s) are required by the application at runtime.
While not ideal disabling this single step is much better than disabling
linking for the whole application.
A better approach is described in https://github.com/xamarin/xamarin-macios/issues/6048
but this configuration optimization makes sense independently of it.
Fix https://github.com/xamarin/xamarin-macios/issues/3655
2019-05-16 09:16:32 -07:00
Sebastien Pouliot
c481aac216
[apidiff] Add q quick'n'dirty script to produce a diff between any two bundle.zip ( #6050 )
...
Use for producing API diff for release notes without waiting for a PR,
bots and/or approvals...
Also useful to produce API diff between any versions, not just between
the current revision and a baseline (last stable).
2019-05-15 12:46:38 -05:00
Vincent Dondain
a48669ead5
[appkit] Make NSCell and NSControl 'Formatter' accept null ( #6042 )
...
- Fixes #6032 : NSTextField.Formatter missing null-allowed
(https://github.com/xamarin/xamarin-macios/issues/6032 )
- Update 'NSObject Formatter' to 'NSFormatter'
2019-05-14 10:37:14 -07:00
Manuel de la Pena
81d6225eb7
[XHarness] Fix some issues in the BCL test generator. ( #5938 )
...
We had issues in the code that adds a type found in an assembly to
ensure that it was not removed by the linker. This resulted in some
assemblies having 0 tests.
Added the needed ignore for the corlib tests and system ones.
2019-05-11 12:03:38 +02:00
Rolf Bjarne Kvinge
9d31f99b96
Bump mono. ( #6036 )
...
New commits in mono/mono:
* mono/mono@7361a4f01c [llvmonly] make local copy of trace_ips pointer from exception object (#14409 )
* mono/mono@7daf13e0d4 [2019-02] [runtime] Use MAP_JIT automatically when running under a hardened runtime on osx. (#14413 )
* mono/mono@ca78977b31 [sdks] Add .cs source files to ios archive
* mono/mono@7814ea810c [sdks] Make sure the mono-version.txt directory exists
* mono/mono@f9cdf7b986 Bump helix-binaries
* mono/mono@238d4a71db A deadlock happens when during a process_suspend there is a pending invoke and then when it's calling the invoke there is another call to process_suspend in the same thread. (#14387 )
* mono/mono@189b0c5c35 [sdks] Add Mono version to ios/mac archive
* mono/mono@ff46d6e49e [sdks] Fix wrong path
* mono/mono@2397d41abf [sdks] Add Mono binaries to mac archive
Diff: bc3791b0ff..7361a4f01c
2019-05-10 15:52:18 +02:00
Rolf Bjarne Kvinge
8d6215f9ec
Bump mono.
...
New commits in mono/mono:
* mono/mono@f1aa58d9a9 [2019-02] Do not allocate handles in ReleaseMutex. (#14428 )
* mono/mono@382c836e7f Mutex memory leak on sgen GC (nursery, major).
* mono/mono@6ab15f2529 Usually do not create a handle in mono_runtime_invoke_handle. (#14423 )
Diff: 7361a4f01c..f1aa58d9a9
2019-05-10 15:17:30 +02:00
Rolf Bjarne Kvinge
3a72377b70
[xharness] Don't run the mono-native-compat test on ARM64_32.
...
ARM64_32 only supports the unified native mode.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
3881b86f61
Bump mono.
...
New commits in mono/mono:
* mono/mono@7361a4f01c [llvmonly] make local copy of trace_ips pointer from exception object (#14409 )
* mono/mono@7daf13e0d4 [2019-02] [runtime] Use MAP_JIT automatically when running under a hardened runtime on osx. (#14413 )
* mono/mono@ca78977b31 [sdks] Add .cs source files to ios archive
Diff: 7814ea810c..7361a4f01c
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
b67fa47edb
Bump mono.
...
New commits in mono/mono:
* mono/mono@7814ea810c [sdks] Make sure the mono-version.txt directory exists
* mono/mono@f9cdf7b986 Bump helix-binaries
* mono/mono@238d4a71db A deadlock happens when during a process_suspend there is a pending invoke and then when it's calling the invoke there is another call to process_suspend in the same thread. (#14387 )
* mono/mono@189b0c5c35 [sdks] Add Mono version to ios/mac archive
* mono/mono@ff46d6e49e [sdks] Fix wrong path
* mono/mono@2397d41abf [sdks] Add Mono binaries to mac archive
Diff: bc3791b0ff..7814ea810c
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
e3fc04a8a3
[tests][mtouch] Adjust Xamarin.Tests.ProductTests.MinOSVersion for watchOS/arm64_32 slices.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
76c2361965
[tests][mtouch] Adjust minOS version test for arm64_32.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
adbc87ff1d
[monotouch-test] LLVM's too smart for our tests, so ignore Symbols.FunctionNames when LLVM is enabled.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
1bf8ed3ebc
[tests][mtouch] Add abi/architecture tests for arm64_32.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
c4c17fa293
[monotouch-test] Adjust for arm64_32 abi.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
b2c5c8689a
[introspection] ARM64_32 adjustments.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
321c6e7a87
[xharness] Don't add Debug variations for arm64_32, we don't support it yet.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
2f8100d962
[xharness] Add ARM64_32 support.
2019-05-10 11:28:22 +02:00
Rolf Bjarne Kvinge
bb09ab8a24
[generator] Treat arm64_32 as arm64 when dealing with objc_msgSend behavior.
2019-05-10 08:28:43 +02:00
Rolf Bjarne Kvinge
e58a31ee84
[CoreGraphics] Fix CGColorConversionInfo on arm64_32.
2019-05-10 08:28:43 +02:00
Rolf Bjarne Kvinge
91a5dc29ae
[ObjCRuntime] The NSLog_arm64 P/Invoke is now needed on watchOS (ARM64_32) too.
2019-05-10 08:28:43 +02:00
Rolf Bjarne Kvinge
9c3754b52f
[msbuild] Make using the fake watchOS 4.3 SDK disabled by default.
...
Since we now have support for ARM64_32.
2019-05-10 08:28:43 +02:00
Rolf Bjarne Kvinge
f272f69e3a
[runtime] Enable the varargs dynamic trampolines for arm64_32.
...
The varargs dynamic is not even close to correct for arm64_32, but it's still
better than failing to compile the runtime.
A proper dynamic registrar for arm64_32 is much more complicated, in
particular because we can't use assembly code, so it will have to be
implemented later.
2019-05-10 08:28:43 +02:00