Skip to content

Conversation

@baulig
Copy link
Contributor

@baulig baulig commented Feb 9, 2018

No description provided.

luhenry and others added 29 commits December 11, 2017 10:45
@baulig baulig added the do-not-merge PR should not be merged. label Feb 9, 2018
Commit list for mono/mono:

* mono/mono@3577465fcd6 add LL suffix to constant in order to prevent overflowing on 32bit systems
* mono/mono@7d9e106c032 1000ns = 1us and 1us = 10ticks
* mono/mono@3931767dcab reduce compiler warnings
* mono/mono@deb3474e7cc add regression test for github issue 7646
* mono/mono@27c7a4b01ed use utimes if available in order to set subsecond information on access and write time
* mono/mono@da5b39d785f factor setfiletime
* mono/mono@7f69ff87b57 use CONVERT_BASE in more places
* mono/mono@e33bf27c9ad replace SECMULT with TICKS_PER_SECOND
* mono/mono@79030a32843 remove unused mono_w32file_get_times ()
* mono/mono@e74d4a6e31f Merge pull request #7686 from mono/backport-gh-7584
* mono/mono@c2fe39f13ef Revert "Replace mono_msec_boottime() with CoreCLR implementation. Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=58413"
* mono/mono@0d8de253cbb [System.Net] Replace use of obsolete `SupportsIPv6` property.

Diff: mono/mono@e9c5120...3577465
dellis1972 pushed a commit that referenced this pull request Mar 20, 2018
Fixes: mono/mono#7511
Fixes: #1438

Context: #1289

PR #1289 bumps xamarin-android to use the mono/2018-02 branch, and is
encountering an error when executing the
`Xamarin.Android.Build.Tests.AndroidUpdateResourcesTest.CheckResourceDesignerIsCreated()`
test, with the following error:

	/Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/bin/Debug/lib/xamarin.android/xbuild/Xamarin/Android/Xamarin.Android.Common.targets: error : Error executing task GenerateResourceDesigner: Could not load file or assembly 'FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies.
	Error executing task GenerateResourceDesigner: System.IO.FileNotFoundException: Could not load file or assembly 'FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies.
	File name: 'FSharp.Core, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
	  at System.CodeDom.Compiler.CodeDomProvider.CreateGenerator (System.IO.TextWriter output) [0x00000] in /Users/builder/jenkins/workspace/build-package-osx-mono/2018-02/external/bockbuild/builds/mono-x64/external/corefx/src/System.CodeDom/src/System/CodeDom/Compiler/CodeDomProvider.cs:123
	  at Xamarin.Android.Tasks.GenerateResourceDesigner.WriteFile (System.String file, System.CodeDom.CodeTypeDeclaration resources, System.String language, System.Boolean isFSharp, System.Boolean isCSharp) [0x0012a] in /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesigner.cs:217
	  at Xamarin.Android.Tasks.GenerateResourceDesigner.Execute () [0x0065b] in /Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesigner.cs:155
	  at Microsoft.Build.BuildEngine.TaskEngine.Execute () [0x00000] in /Users/builder/jenkins/workspace/build-package-osx-mono/2018-02/external/bockbuild/builds/mono-x64/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs:134
	  at Microsoft.Build.BuildEngine.BuildTask.Execute () [0x0008d] in /Users/builder/jenkins/workspace/build-package-osx-mono/2018-02/external/bockbuild/builds/mono-x64/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs:101

The mono/2018-02 branch bumps the `FSharp.Core.dll` assembly that is
distributed with mono to have an assembly version of 4.4.1.

The `FSharp.Compiler.CodeDom` NuGet package that
`Xamarin.Android.Build.Tasks.dll` references requires FSharp.Core
4.3.1, hence the `FileNotFoundException`.

The (hopeful) fix? Install the required `FSharp.Core.dll` version, so
that `FSharp.Compiler.CodeDom` can work as desired.
lewurm added 2 commits March 21, 2018 10:49
Commit list for mono/mono:

* mono/mono@c17d8c6dcdc remove WildcardConnect () on WatchOS
* mono/mono@e29f146ab36 [2018-02] [sgen] Use current nursery size when computing allowance (#7648)
* mono/mono@535bfc5d845 Add csc-dim as a prototype if default interface implementation
* mono/mono@5b66de0bf08 [2018-02] [sdks] Fix concurrent building of MonoAotOffsetsDumper.exe + Simplify building of support library (#7688)
* mono/mono@a6c7b9eca49 [msbuild] Bump msbuild to pick up fix for issue #7184 (#7666)

Diff: mono/mono@3577465...c17d8c6
luhenry added 13 commits April 3, 2018 18:35
Commit list for mono/mono:

* mono/mono@95cc49a65c0 [2018-02] [Facades] Add System.Memory facade to mobile profiles (#7967)
* mono/mono@dea448aa838 Disable building btls/ and support/ on the bcl build, they are not needed.
* mono/mono@21cef8b793a [runtime] Add a --disable-btl-lib configure option to disable the building of the btls lib, but compile the managed code with btls support.
* mono/mono@0ba54d6bdd0 [ppc] use ucontext_t
* mono/mono@c3e00ab9bc6 [runtime] Add regression test for nested famility visibility.
* mono/mono@30b5b2b1880 [runtime] Fix class visibility check for protected nested classes. Fixes #7657.
* mono/mono@29adf3012f7 Bump API snapshot submodule
* mono/mono@d6fde73640b [corlib] Update linker descriptor with missing types
* mono/mono@572c33ae18d [corlib] Enable machine.config dependant version of CryptoConfig for net_4_x profile only
* mono/mono@dcdd956e1b3 [perfcounters] fix alignment issue on 32bit
* mono/mono@811e3b4dcd2 [sdks] Fix LLVM build for XA (#7919)
* mono/mono@25aba4e86ef [2018-02] [sdks] Fix LLVM build on Linux for XA + Fix MXE usage on non-Darwin platforms (#7912)
* mono/mono@ae7f365c064 [sdks] Fix usage of MXE for XA (#7898)
* mono/mono@cda8574a885 [jit] Add signature checking for CALLI. (#7880)
* mono/mono@a6b0e1ccbed [2018-02] [sdks] Pass LLVM_SRC from XA to use `xamarin-android/external/llvm` + Pass IGNORE_PACKAGE_MXE from XA + Only checkout specific MXE and LLVM commit when cloning (#7895)
* mono/mono@7ee378c9045 [sdks] Pass MXE_SRC from XA to use `xamarin-android/external/mxe` (#7890)
* mono/mono@511ca9f5073 Whitelist illinkanalyzer in macOS package (#7862)
* mono/mono@88b52663760 Merge pull request #7851 from monojenkins/backport-pr-7849-to-2018-02
* mono/mono@4aa9fd41b87 [msbuild] Bump to pick up updates (#7846)
* mono/mono@4bf541a969f [System] Makes TLS providers linker friendly
* mono/mono@b250b4a6571 [2018-02] [sdk] sync ios and android changes from master into `2018-02` (#7831)
* mono/mono@6c324b91b22 [corlib] Restores ConcurrentDictionary serialization support.
* mono/mono@77fc4cfa2e0 Remove suspicious mono_gchandle_free
* mono/mono@3984508a04c [icall] remove DISABLE_PROCESS_HANDLING (#7827)
* mono/mono@67a2468db9c support increment and decrement of nint/nuint (#7790)
* mono/mono@da0e172ae59 improve error message and add another interp_in signature (#7789)
* mono/mono@1c9d8aad07b [sdks] Fix the ios sdk build. (#7801) (#7824)
* mono/mono@c6fc176f5c0 Fix Android build for toolchain (#7818)
* mono/mono@c9bf7a38784 Disable the interpreter on ios device builds. (#7795)
* mono/mono@d37075a9491 [System] Disable a test file to resolve compilation error
* mono/mono@42fc0bd51fb Bump corefx to bring a fix for #7696
* mono/mono@2487301fafb Fix Android build for mxe (#7782)
* mono/mono@0d6be4da5ec [sdks] Fix Android build on Linux (#7777)
* mono/mono@ebbed2bb875 Revert "Swap Close/Dispose calls so that the receiver_thread_main loop will be properly interrupted (#7390)" (#7751)
* mono/mono@e5bad88ebb1 Fix Android build (#7769)
* mono/mono@238c21cf77d Fix a race condition that was exposed by #7358 (see #7668).
* mono/mono@2fbd5a16a38 [runtime] Fix file handle leak with dedup+aot (#7721)
* mono/mono@a13c12ac991 [2018-02] [loader] Don't load framework Facade assemblies that are older than expected. (#7708)
* mono/mono@bdf405fae43 Merge pull request #7726 from mono/backport-new-boottime-2018-02
* mono/mono@ce612bb49ec Fix partially shared constrained calls in llvmonly mode.
* mono/mono@0a3d40ac609 Avoid aot-ing the bcl libs twice in make fullaotcheck/llvmonlycheck.
* mono/mono@07d5a031d46 [runtime] Don't use clock_gettime on WatchOS and tvOS.
* mono/mono@ff546b9d8be [runtime] Don't use clock_gettime in MacOS.
* mono/mono@9922d1af205 [runtime] Fix mono_msec_boottime () so it compiles on older ios versions, clock_gettime () is only available from ios 10. (#7671)
* mono/mono@875240538e1 [mono-time] Replace mono_msec_boottime() with CoreCLR implementation. Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=58413

Diff: mono/mono@c17d8c6...95cc49a
Commit list for mono/mono:

* mono/mono@2c564f83f2f [System]Fix memory leak in the web stack related to `Task.Delay` (partial fix of #7356).
* mono/mono@3c52f0a4a9a [SDKS] Fix Android SDK build on Linux (#8023)
* mono/mono@c5f99aa4dc3 [interp] do not bake object reference into code stream
* mono/mono@1e35db0ae2d [interp] fix i4<>i8 conversion for builtin types, it was inverted (#7986)
* mono/mono@88f5058a332 [sdks] Fix MXE_PREFIX for XA (#8010)
* mono/mono@0d5eb5c9bb0 [sdb] Add reference counting for single step requests, they can be accessed concurrently by the single step processing code and the event request clearing code. Fixes #7137. (#7972)
* mono/mono@723f194cdcf [2018-02] [sdks] Add provisioning for Android SDK and NDK (#7979)
* mono/mono@a5e4482376a [System] Disable SocketTest.AcceptBlockingStatus (#7977)

Diff: mono/mono@95cc49a...2c564f8
Commit list for mono/mono:

* mono/mono@02390a7414e [sdks] Fix build (#8183)
* mono/mono@cea42949126 [corlib] Make more crypto oids work on mobile profiles when not linked out
* mono/mono@9e7efad7be2 [mcs] Fixes parameter check for interface types used with default parameters
* mono/mono@d0562a9e6ff [sdks] Add support for building llvm unless the USE_PREBUILT_LLVM Make.config var is set. (#8017) (#8150)
* mono/mono@887d3ad27e0 [System] Don't use http://www.mono-project.com for test (#8147)
* mono/mono@363790b1ec5 [corlib] Implements CryptoConfig::AddAlgorithm on all profiles
* mono/mono@bf838da659a [w32file] Fix memory leak (#8114)
* mono/mono@c530c5182f2 [2018-02] Implement C#7 binary literals (#8119)
* mono/mono@e310966925f [2018-02] [Facades] Add System.Drawing.Common on mobile only (#8128)
* mono/mono@5c2ab44dec3 [mcs] Adds private protected modifier to the parser only
* mono/mono@0fac09cf893 [sdks] Fix arguments passed to llvm on Linux (#8109)
* mono/mono@02d69477dd7 [mcs] Fixes codegen when probing reference type expression is known to pass and pattern variable has to be created (#8085)
* mono/mono@54f51bf7015 [interp] use same domain as transform phase to register debug data for a method
* mono/mono@0ca09346e39 [SDKS] fix Linux (and possibly other OSes) build for Android (#8044)
* mono/mono@f5989de3b47 [mcs] Implements C# 7.2 stackalloc span conversion in conditional expression
* mono/mono@8ad86236463 [interp] workaround undefined behaviour in r8 to u1 cast
* mono/mono@19cc4c427ab [runtime] Fix --disable-btls.
* mono/mono@e88bfbcbce0 [mcs] Implements C# 7.2 conditional ref expression
* mono/mono@7048fb45ab5 [sdks] Use wget in place of curl, it's installed by default on Linux (#8058)

Diff: mono/mono@2c564f8...02390a7
Commit list for mono/mono:

* mono/mono@dbf27d49ad9 [sdks] Fix typo (#8187)

Diff: mono/mono@02390a7...dbf27d4
Commit list for mono/mono:

* mono/mono@763e7f9d783 [system.net] disable some tests to unblock XI integration (#8205)
* mono/mono@35cb6bda95d [System.Net.Http] Use '*' as the host instead of '+' in the tests. Fixes xamarin/maccore#673.
* mono/mono@61da4c7a5f1 [eglib] GMarkup: allow all ASCII NameStartChar and NameChar except ':'
* mono/mono@2710e67296e [sdks] Add ANDROID_BUILD_TOOLS_DIR to differentiate it from ANDROID_BUILD_TOOLS_VERSION (#8192)

Diff: mono/mono@dbf27d4...763e7f9
Commit list for mono/mono:

* mono/mono@64ec2dd3eb1 [corlib] SynchronizationContext does not work on non-root AppDomain on Android (#8296)
* mono/mono@9bbc930d620 [w32file-unix] fix mistake in 8430155946c31f0f3f5f04017eebd79ac15e566d (#8299)
* mono/mono@891c01eb6e3 [2018-02] [runtime] Add public API to set the pending exception. (#8280)
* mono/mono@e03516d11f7 [mcs] Implements C# 7 digits separators
* mono/mono@4a00c501b21 [2018-02] Harden JIT job control against cctors deadlocking. (#8235)
* mono/mono@34b31f05f50 [2018-02] Fix timestamp for file copy (#8247)
* mono/mono@8e08947e1cd [sdks] Fix typo + Fix verbosity of unzip-android-archive.sh (#8243)
* mono/mono@d96186b5e8f [w32handle] Lower minimum memory usage (2nd attempt) (#8154)

Diff: mono/mono@763e7f9...64ec2dd
luhenry added 3 commits April 18, 2018 19:21
Commit list for mono/mono:

* mono/mono@6c5b8bcc39c [sdks] Fix mktemp parameters (#8324)
* mono/mono@b1dda64bda8 [corlib] Fix TimeZoneInfo.Local when /usr/share/zoneinfo is a symlink (#8304)

Diff: mono/mono@64ec2dd...6c5b8bc
Commit list for mono/mono:

* mono/mono@638a7ed3b0e [corlib] Disable failing test on XA (#8352)

Diff: mono/mono@6c5b8bc...638a7ed
@luhenry luhenry removed the do-not-merge PR should not be merged. label Apr 20, 2018
@jonpryor
Copy link
Contributor

Proposed squash-and-merge commit message:

Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=11771
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=15051
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=19436
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=45901
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=56071
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58413
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58413
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58413
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59184
fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60065
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60225
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60298
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60359
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60568
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60756
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60848
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60862
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60900
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60904
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60986
Fixes: https://github.com/mono/mono/issues/59400
Fixes: https://github.com/mono/mono/issues/6169
Fixes: https://github.com/mono/mono/issues/6187
Fixes: https://github.com/mono/mono/issues/6192
Fixes: https://github.com/mono/mono/issues/6255
Fixes: https://github.com/mono/mono/issues/6264
Fixes: https://github.com/mono/mono/issues/6266
Fixes: https://github.com/mono/mono/issues/6281
Fixes: https://github.com/mono/mono/issues/6283
Fixes: https://github.com/mono/mono/issues/6320
Fixes: https://github.com/mono/mono/issues/6339
Fixes: https://github.com/mono/mono/issues/6343
Fixes: https://github.com/mono/mono/issues/6349
Fixes: https://github.com/mono/mono/issues/6379
Fixes: https://github.com/mono/mono/issues/6383
Fixes: https://github.com/mono/mono/issues/6401.
Fixes: https://github.com/mono/mono/issues/6411
Fixes: https://github.com/mono/mono/issues/6414
Fixes: https://github.com/mono/mono/issues/6490
Fixes: https://github.com/mono/mono/issues/6721
Fixes: https://github.com/mono/mono/issues/6767
Fixes: https://github.com/mono/mono/issues/6777
Fixes: https://github.com/mono/mono/issues/6848
Fixes: https://github.com/mono/mono/issues/6940
Fixes: https://github.com/mono/mono/issues/6948
Fixes: https://github.com/mono/mono/issues/6998
Fixes: https://github.com/mono/mono/issues/7016
Fixes: https://github.com/mono/mono/issues/7085
Fixes: https://github.com/mono/mono/issues/7086
Fixes: https://github.com/mono/mono/issues/7095
Fixes: https://github.com/mono/mono/issues/7137
Fixes: https://github.com/mono/mono/issues/7184
Fixes: https://github.com/mono/mono/issues/7240
Fixes: https://github.com/mono/mono/issues/7262
Fixes: https://github.com/mono/mono/issues/7289
Fixes: https://github.com/mono/mono/issues/7338
Fixes: https://github.com/mono/mono/issues/7356
Fixes: https://github.com/mono/mono/issues/7364
Fixes: https://github.com/mono/mono/issues/7378
Fixes: https://github.com/mono/mono/issues/7389
Fixes: https://github.com/mono/mono/issues/7460
Fixes: https://github.com/mono/mono/issues/7535
Fixes: https://github.com/mono/mono/issues/7536
Fixes: https://github.com/mono/mono/issues/7610
Fixes: https://github.com/mono/mono/issues/7624
Fixes: https://github.com/mono/mono/issues/7637
Fixes: https://github.com/mono/mono/issues/7655
Fixes: https://github.com/mono/mono/issues/7657
Fixes: https://github.com/mono/mono/issues/7685
Fixes: https://github.com/mono/mono/issues/7786
Fixes: https://github.com/mono/mono/issues/7792
Fixes: https://github.com/mono/mono/issues/7822
Fixes: https://github.com/mono/mono/issues/7860
Fixes: https://github.com/mono/mono/issues/8089
Fixes: https://github.com/mono/mono/issues/8267
Fixes: https://github.com/mono/mono/issues/8409
Fixes: https://github.com/xamarin/maccore/issues/628
Fixes: https://github.com/xamarin/maccore/issues/629
Fixes: https://github.com/xamarin/maccore/issues/673
Fixes: https://github.com/xamarin/maccore/issues/673
Fixes: https://github.com/xamarin/xamarin-android/issues/1561\#issuecomment-381736716

@jonpryor jonpryor merged commit 166e7d5 into master Apr 25, 2018
@jonpryor jonpryor deleted the mono-2018-02 branch July 27, 2018 21:06
@github-actions github-actions bot locked and limited conversation to collaborators Feb 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

full-mono-integration-build For PRs; run a full build (~6-10h for mono bumps), not the faster PR subset (~2h for mono bumps)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants