Граф коммитов

547 Коммитов

Автор SHA1 Сообщение Дата
Alex Soto 46eaabc17d [xcode14.3] Update bindings to Xcode 14.3 2023-03-29 14:37:51 -04:00
Rolf Bjarne Kvinge 61ff4277ea
Bump maccore. (#17898)
Bump maccore to get fix for mlaunch:

* 3ce5b1e181
2023-03-28 12:44:03 +02:00
Rolf Bjarne Kvinge a2d9424cf6
Bump mlaunch to get fix for Xcode 14.3 beta 1. (#17586)
Ref: 52cb086032
2023-02-23 09:08:59 +01:00
Rolf Bjarne Kvinge 2b03ac31a6
Bump mlaunch to fix an unneccessary warning. (#17523)
Ref: 645f1813c5
2023-02-14 15:00:01 +01:00
Alex Soto 27b27ee42a
[mono] Bump mono to match android (#16851)
New commits in mono/mono:

* mono/mono@6dd9def57c Change download URL for PCL reference assemblies
* mono/mono@d3f9882f92 Bump llvm to pick up 7424e2ca2f78a3c338fe5b07a2d4eb6dd6574195.
* mono/mono@ca8abcb6bc Bump NuGetSdkResolver in msbuild
* mono/mono@2ab67d5ef2 Bump nuget.exe to v6.3.1
* mono/mono@7cd0b7f82c Fix incorrect version comparison in loader
* mono/mono@a96bde9730 Backport fixes for sharing wrappers when type attributes are involved
* mono/mono@e7c645a340 Backporting https://github.com/dotnet/runtime/pull/59861

Diff: 2a19f878da..6dd9def57c
2022-11-22 07:28:50 +01:00
Rolf Bjarne Kvinge 19f7a168ac
Switch maccore to track main and bump. (#16617)
Also add copy make target to bump the current maccore hash from maccore.

New commits in xamarin/maccore:

* xamarin/maccore@893e01ae00 Update provisionator bootstrap
* xamarin/maccore@7fa40752e4 Merge xcode14 into main.
* xamarin/maccore@140923bddf Merge remote-tracking branch 'xamarin/xcode14' into merge-xcode14-into-main
* xamarin/maccore@4e3eab455c Use Environment.SpecialFolder.UserProfile, not SpecialFolder.Personal.
* xamarin/maccore@9a347bd708 [certificates] Update la_dev_apple.p12, la_distr_apple.p12 and la_mac_installer_distr.p12
* xamarin/maccore@bcdd779e58 [devops] Install Mono too.
* xamarin/maccore@75a03ccbfc [xcode14] Merge main into xcode14
* xamarin/maccore@7690a80a2f [submission] Fix submission test makefile
* xamarin/maccore@813beaf11a Don't build mlaunch from the parent/root makefile anymore.
* xamarin/maccore@695f55471d [analysis] Make sure to create directories before copying files into them.
* xamarin/maccore@29a6536838 [mlaunch] Fix computing the current source branch in CI.
* xamarin/maccore@8c281e0c8f [mlaunch] Build & package without using xamarin-macios.
* xamarin/maccore@3e5c67a1ea [devops] Provision Xcode and Xamarin.Mac on the bots.

Diff: 0837e7caff..893e01ae00
2022-11-08 07:40:02 +01:00
Rolf Bjarne Kvinge c7badeacf1 Merge main into xcode14.1. 2022-10-04 16:21:54 +02:00
Rolf Bjarne Kvinge e8c7805ddf
Remove part of the maccore logic. (#16181)
* Don't load maccore/mk/versions.mk anymore, which means we're not checking
  any subsequent dependencies listed in maccore. Note that we still need the
  maccore dependency itself for a little while longer.
* Remove some outdated testing code that called into maccore.
* Don't recurse into the maccore directory during make.
* Remove some code checking for ENABLE_XAMARIN that's not used anymore, in
  particular in xharness.
2022-09-30 09:30:12 +02:00
Rolf Bjarne Kvinge 433c48a35e Merge remote-tracking branch 'origin/main' into bump-main-in-xcode14-2022-09-07 2022-09-07 10:56:00 +02:00
Rolf Bjarne Kvinge d1ef85446d
Misc fixes to make the build more silent. (#15852) 2022-09-05 10:55:41 +02:00
Rolf Bjarne Kvinge 11fc44810d
Bump maccore. (#15748)
New commits in xamarin/maccore:

* xamarin/maccore@9a347bd708 [certificates] Update la_dev_apple.p12, la_distr_apple.p12 and la_mac_installer_distr.p12
* xamarin/maccore@bcdd779e58 [devops] Install Mono too.
* xamarin/maccore@7690a80a2f [submission] Fix submission test makefile

Diff: 813beaf11a..9a347bd708
2022-08-25 09:34:43 +02:00
Manuel de la Pena 4c4b906bc4 [Xcode14] Merge main into xcode14. 2022-07-26 11:15:34 -04:00
Rolf Bjarne Kvinge 0aaf6d9284
Bump mono to get debugging fix when using the interpreter. (#15507)
New commits in mono/mono:

* mono/mono@2a19f878da Backport https://github.com/dotnet/runtime/pull/71436
* mono/mono@6051b71072 Bump nuget.exe to v6.2.1
* mono/mono@f354099a6b Set app context to null on thread detach
* mono/mono@6c7e72dd8e [mono] Fix a crash during stack trace construction if a this object is null.

Diff: dffa5ab922..2a19f878da
2022-07-18 10:33:28 -04:00
Rolf Bjarne Kvinge 12925a7952
[xcode14] Merge main into xcode14. (#15502)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
2022-07-15 10:22:11 +02:00
Rolf Bjarne Kvinge 786303bb29
[dotnet] Add support for 'make dotnet-install-system'. (#15498) 2022-07-15 09:58:03 +02:00
Rolf Bjarne Kvinge ac1fa25816
[mlaunch] Download mlaunch from NuGet instead of building from maccore. (#15298)
Download mlaunch from NuGet instead of building from maccore, and copy the
downloaded files into the packages we ship (both legacy Xamarin's pkg and .NET
nupkgs).

Eventually we'll want to reference the mlaunch NuGet from the .NET nupkgs, but
that's a later step.
2022-07-13 11:00:15 +02:00
Rolf Bjarne Kvinge 4904236782 Bump maccore to get mlaunch fix.
New commits in xamarin/maccore:

* xamarin/maccore@0837e7caff [mlaunch] Load new libraries in Xcode 14.0

Diff: 713bcb2442..0837e7caff
2022-06-07 18:18:11 +02:00
Rolf Bjarne Kvinge 4542fce4a2
Bump maccore. (#15158)
New commits in xamarin/maccore:

* xamarin/maccore@713bcb2442 [mlaunch] Flush the output from the pty.

Diff: 29e384e9e3..713bcb2442
2022-05-31 18:17:01 +02:00
Rolf Bjarne Kvinge ab7f0784ef
Bump maccore. (#15141) 2022-05-30 11:32:09 +02:00
Rolf Bjarne Kvinge 5041b4cfa8
Bump maccore. (#14979)
New commits in xamarin/maccore:

* xamarin/maccore@86db4740ec [mlaunch] Add support for installing and launching apps with simctl.
* xamarin/maccore@0f0ca14cf2 [mlaunch] Don't launch watch apps with simctl quite yet.

Diff: 29a1c1382e..0f0ca14cf2
2022-05-27 09:58:05 +02:00
Rolf Bjarne Kvinge e3a03d2804
Remove the Visual Studio dependency. (#15102)
Remove our dependency on Visual Studio. Use the 'dotnet-t4' tool instead of
invoking the t4 tool embedded in Visual Studio.

Fixes this build error after installing VS Mac 2022:

> Cannot open assembly '/Applications/Visual Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe': No such file or directory.
2022-05-25 08:26:51 +02:00
Alex Soto f67029b01c
[mono] Bump mono to the latest version of 2020-02 (#15042)
New commits in mono/mono:

* mono/mono@dffa5ab922 [2020-02] Bump corefx to get MaxResponseHeadersLength fix

Diff: 281ee19b9b..dffa5ab922
2022-05-17 14:22:31 +02:00
Rolf Bjarne Kvinge adb56501da
[apidiff] Switch to getting mono-api-[info|html] from rolfbjarne/api-tools. (#14965)
Switch to getting mono-api-[info|html] from a newly created repository we
control and where we can easily fix issues, since mono/mono isn't getting many
fixes anymore. In the past I know I've been reluctant to look at these tools,
just because of the hassle of setting things up to debug, and then the
paperwork to get the fixes in mono/mono, and then backported to the branch
where we need them.

This repo has a few other benefits:

* The tools are built using normal projects, which means they're easy to debug
  in an IDE (mono/mono's code has generated project files, which used in-tree versions
  of the BCL, and it got quite complex quite fast).
* One fewer dependency on the mono archive, so we're getting closed to be able
  to drop it completely when we drop support for legacy Xamarin.
* #13669 is already fixed there.
* It contains a few other misc fixes.

Fixes https://github.com/xamarin/xamarin-macios/issues/13669.
2022-05-11 22:01:39 +02:00
Rolf Bjarne Kvinge ffae484355
Bump mono to get fix for #12416. (#14934)
New commits in mono/mono:

* mono/mono@281ee19b9b [mono] Remove some of the restrictions on constrained calls from gsharevt methods.
* mono/mono@ed0788bf61 [2020-02] Use upstream zlib 1.2.12

Diff: 86118d5810..281ee19b9b

Fixes https://github.com/mono/mono/issues/21187.
Fixes https://github.com/xamarin/xamarin-macios/issues/12416.
2022-05-10 09:27:02 +02:00
Rolf Bjarne Kvinge a07fda8f33
Bump maccore to get fix for #14834. (#14946)
New commits in xamarin/maccore:

* xamarin/maccore@29a1c1382e [mlaunch] Redirect stdout and stderr through a pty when launching in the simulator. Fixes #14834.

Diff: 749e84cb16..29a1c1382e

Fixes https://github.com/xamarin/xamarin-macios/issues/14834.
2022-05-10 09:18:20 +02:00
Rolf Bjarne Kvinge 3c8984c1c5
Bump maccore. (#14875)
New commits in xamarin/maccore:

* xamarin/maccore@749e84cb16 [mlaunch] Make minor improvements to Main.cs

Diff: cf9f7409e9..749e84cb16
2022-05-05 10:20:44 +02:00
Rolf Bjarne Kvinge eb89a34318
Bump mono to get fix for #mono/mono@21450. (#14772)
New commits in mono/mono:

* mono/mono@86118d5810 [2020-02] [AOT] Don't set the 'CorrectedSynthesize' flag in the objc_imageinfo section.
* mono/mono@5a3fe49fc5 [2020-02][cominterop] Fix CCW memory leak

Diff: adf1bc4335..86118d5810
2022-04-22 09:02:40 +02:00
Rolf Bjarne Kvinge d839bbe782
Bump maccore. (#14575)
New commits in xamarin/maccore:

* xamarin/maccore@1c5dfc89f0 [mlaunch] Fix booting simulator devices when the simulator app is already running in Xcode 13.3. Fixes #14560. Fixes AB#1509963
 xamarin/maccore@cf9f7409e9 [mlaunch] Fix booting simulator devices on older Xcode versions.

Diff: 4eb40042c1..cf9f7409e9
2022-03-31 07:49:58 +02:00
Rolf Bjarne Kvinge 895e556435
Bump maccore. (#14531)
New commits in xamarin/maccore:

* xamarin/maccore@4eb40042c1 Support --killdev with PID argument

Diff: 8287d19786..4eb40042c1

Co-authored-by: Alex Soto <alex@alexsoto.me>
2022-03-30 08:54:13 +02:00
Rolf Bjarne Kvinge fd772aa82b
Bump mono. (#14555)
New commits in mono/mono:

* mono/mono@adf1bc4335 Bump corefx submodule to get brotli update

Diff: f34bd77e39..adf1bc4335
2022-03-30 08:42:24 +02:00
Rolf Bjarne Kvinge b340e26595
Bump maccore. (#14417)
New commits in xamarin/maccore:

* xamarin/maccore@8287d19786 [submission] Only be optionally quiet.
* xamarin/maccore@5fe27fdd36 [submission] Add makefile target to add all the certs.
* xamarin/maccore@98670dcf31 [submission] Write results as tests are executed.

Diff: 696db0a953..8287d19786

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-03-17 10:16:31 +01:00
Rolf Bjarne Kvinge 79d7cfc82c
Bump maccore. (#14352)
New commits in xamarin/maccore:

* xamarin/maccore@696db0a953 Allow launch Simulator as the only action

Diff: 0402961be3..696db0a953
2022-03-09 12:34:00 -05:00
Rolf Bjarne Kvinge a867400451
Bump maccore. (#14349)
New commits in xamarin/maccore:

* xamarin/maccore@0402961be3 Add Simulator state into results XML when listing Simulators
* xamarin/maccore@e06c4fda77 [Docfixer] Remove the docfixer tool.

Diff: 6e6b84249b..0402961be3
2022-03-09 14:47:19 +01:00
Alex Soto 14d5620f5f
[mono] Bump mono to the HEAD of 2020-02 to match android (#14294)
New commits in mono/mono:

* mono/mono@f34bd77e39 [2020-02][Android] Workaround for invalid return value from clock_nanosleep
* mono/mono@0f5e80e577 Disable ClientWebSocketTest tests that started failing for no reason

Diff: 4efc825e83..f34bd77e39

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-03-03 18:37:57 -05:00
Alex Soto b822fbe4cf
[mono] Bump mono to the HEAD of 2020-02 (#14137)
New commits in mono/mono:

* mono/mono@4efc825e83 [Tools] Fix mono-api-html MarkdownFormatter.cs to avoid a NRE
* mono/mono@6171c87180 vtable setup fix for generic default interface methods in mono runtime
* mono/mono@148f536b0b [2020-02] [AOT] Use .short directive instead of .hword
* mono/mono@a6f3e8f179 Avoid an assert in ves_icall_RuntimeFieldInfo_SetValueInternal
* mono/mono@3c4f3de377 Add correct InetAccess category to HttpClientTest.Proxy_Disabled test and disable Ping tests
* mono/mono@9f35bf1b80 Add missing handle function enter/return macros

Diff: 45efaa3b6f..4efc825e83
2022-02-15 14:42:24 -05:00
Rolf Bjarne Kvinge 478c1d2c8f
Bump maccore. (#14121)
New commits in xamarin/maccore:

* xamarin/maccore@6e6b84249b [release] Don't try to remove the prebuilt app, it's not there anymore.

Diff: 037cc66058..6e6b84249b
2022-02-10 14:51:51 -05:00
Rolf Bjarne Kvinge 1d9a02cbef
[dotnet] Figure out where to publish files in the app bundle. Fixes #12572. (#13591)
In .NET, all files that should be published (put into the final .app bundle) are put into the @(ResolvedFileToPublish) item group, and at the end of the build process, .NET will publish all the files in that item group. Which files are in this item group, and how they're put in there, is out of our control (it's just how the build process works in .NET), so we'll have to cope.

Additionally, publishing an app for Apple platforms is different than publishing other .NET apps, because we can't just put all the files in the a directory like .NET usually does, we have a fairly strict directory structure we need to follow, and it also differs between platforms (the structure is different between macOS and iOS for instance).

This means that for every file in the `ResolvedFileToPublish` item group, we have to figure out:

* Should it be put into the app bundle in the first place?
* If so, in which subdirectory (if any)?

This PR implements these changes. The exact details are explained in a document in the PR, but the general logic is:

* We make an educated guess for some types of files we know about (assemblies, unmanaged libraries, images, etc).
* We provide a way to set metadata on each item specifying which type of item it is (assembly, unmanaged library, image, etc), and we'll treat the item as such. This method can also be used to override the guess we made (for files that shouldn't be published for instance).
* We warn if we run into files we're not educated enough to be able to guess about, and for which there's no custom metadata set.

Fixes https://github.com/xamarin/xamarin-macios/issues/12572.
2022-01-17 09:50:06 +01:00
Alex Soto 0114aabb18
[maccore] Bump maccore to ease submission tests (#13717)
New commits in xamarin/maccore:

* xamarin/maccore@037cc66058 Setup MacCoolApp (NET6) to be duel x86_64/arm64 as required by submission tests now
* xamarin/maccore@3332ba19a0 [submission tests] Always build with /bl, even Legacy
* xamarin/maccore@6bb8bf46dd Fix a few submission test issues and document filters
* xamarin/maccore@b63ef4428c [devops] Add pipeline to test provisioning.

Diff: 0be9399a53..037cc66058
2022-01-14 09:39:17 -05:00
Rolf Bjarne Kvinge 6564841c6a Merge remote-tracking branch 'origin/main' into dotnet-resolvedfiletopublish 2022-01-14 11:00:16 +01:00
Rolf Bjarne Kvinge 2ec10ca397
Bump mono. (#13714)
Bump mono to get fix for https://github.com/dotnet/runtime/issues/61153.

New commits in mono/mono:

* mono/mono@45efaa3b6f [interp] Remove hack for nint/nfloat
* mono/mono@a5d1934898 transform sgen_get_descriptor to parallel safe version in job_major_mod_union_preclean

Diff: b8d7525156..45efaa3b6f
2022-01-14 07:21:58 +01:00
Rolf Bjarne Kvinge 030eb95f21 [mk] Zip it. 2021-12-22 10:17:34 +01:00
Rolf Bjarne Kvinge 30f7ba83f6
Bump mono. (#13574)
New commits in mono/mono:

* mono/mono@b8d7525156 [2020-02] [cominterop] Add coop handle enter/return on native CCW methods
* mono/mono@2ca650f1f6 [2020-02] Adds full path to libcairo for correct assembly directory resolution in monterey
* mono/mono@e750cb3ee5 [aot] Prepend the assembly name to the names of gsharedvt wrappers to avoid duplicate symbol errors during static linking.
* mono/mono@b32801a63c Remove NuGet.config
* mono/mono@dfcef74640 Allow nfloat to be in the ObjCRuntime namespace, and make it work for Xamarin.MacCatalyst.dll as well.
* mono/mono@5ce143a1a8 Revert "[2020-02] Start a dedicated thread for MERP crash reporting (mono/mono#21126)"

Diff: 4150e65c9e..b8d7525156
2021-12-15 20:53:08 +01:00
Rolf Bjarne Kvinge b4aae072c8 [runtime] Build for ARM64/simulators. 2021-11-30 18:20:42 +01:00
Rolf Bjarne Kvinge b70e6f4674
Submodule MonoTouch.Dialog. (#13058)
* Submodule MonoTouch.Dialog.

Submodule MonoTouch.Dialog, so that we can easily build it using .NET. This
submodule will become redundant when/if we publish a .NET version of
MonoTouch.Dialog, but until that happens we need it at least for our own test
suites.

This also means we have to copy our NuGet.config and global.json files to the
MonoTouch.Dialog project directory so that we point msbuild to use our local
build.

New commits in spouliot/Touch.Unit:

* spouliot/Touch.Unit@cbda703 [Touch.Client] Use MonoTouch.Dialog from a submodule. (#109)

Diff: 3345db2f4e..cbda703583

* Use relative path for submodule.

And fix indentation and set the branch name.

* Don't use 'RootTestsDirectory' when it might not be defined yet.

* [tests] Our test projects don't need to reference MonoTouch.Dialog directly.

The projects get the MonoTouch.Dialog reference indirectly through the
Touch.Client project reference.

* [tests] Only validate unique errors in the .NET unit tests.

* [tests] No need to reference System.Json anymore, that's handled directly in the MonoTouch.Dialog project.

* [tests] Reference nunit.framework.targets so we get a workaround for an NUnit issue everywhere.

* [msbuild] Only try to create a package if we're able to create an app bundle.

This fixes an issue where a library project would try (and fail) to create a
package when 'CreatePackage=true' (which could be set for the executable
project, but inherited by the library project since the executable project
depends on it).

* [tests] Adjust PackTest.BindingXcFrameworksProject to not set the AssemblyName property.

MSBuild ends up being very confused when the project we're trying to build
depends on other projects, because AssemblyName is set for all the projects
being build, and MSBuild complains about ambiguous projects:

> error: Ambiguous project name 'bindings-xcframework-test'
2021-10-26 08:18:34 +02:00
Alex Soto 147c264a24
[mono] Bump mono/2020-02 to latest HEAD (#12914)
New commits in mono/mono:

* mono/mono@4150e65c9e [aot] Don't leak unbox trampolines (#21225)
* mono/mono@5a21247f36 Stop using git protocol for submodules
* mono/mono@66e81934b7 [MacSDK] Add F# targets to VisualStudio/v17.0 directory (#21218)
* mono/mono@0c979e6d76 Ignore inherit param for ParameterInfo.GetCustomAttributes (#21201)
* mono/mono@2207434690 [mini] Don't add unbox tramopline on generic DIM calls (#21209)
* mono/mono@a1ada04a58 [2020-02][linux] Some pseudo-tty fixes (#21205)

Diff: 3cf59ad33d..4150e65c9e
2021-10-02 11:47:45 -04:00
Manuel de la Pena 778fd93754
[Maccore] Bump maccore to bring the feed config. (#12904) 2021-10-01 15:17:30 -04:00
Rolf Bjarne Kvinge 6df1ba2a2e
Bump maccore. (#12774)
New commits in xamarin/maccore:

* xamarin/maccore@6f0bf5e2f4 [Dotnet] Update the bundle to hold the dotnet assemblies
* xamarin/maccore@c36eb31d43 Update net6 submission file path

Diff: efad4f0bae..6f0bf5e2f4
2021-09-20 13:40:26 +02:00
Rolf Bjarne Kvinge 855de9623a
Bump maccore. (#12675)
New commits in xamarin/maccore:

* xamarin/maccore@efad4f0bae [Xamarin.Hosting] Fix a few compiler warnings.
* xamarin/maccore@55087e093a [Xamarin.Hosting] Fix detecting app exit on device.
* xamarin/maccore@ffefee386c [Xamarin.Hosting] Add support for launching with debugserver on iOS/tvOS 14+.
* xamarin/maccore@e203814d08 [tests] Fix .ipa path for iOSCoolApp now that it's a fat app.
* xamarin/maccore@c2531ff702 Update the provisionator script.
* xamarin/maccore@2bfa5fa12b [submission] Add a fat Mac Catalyst test app.

Diff: 3e591cbcb1..efad4f0bae
2021-09-10 14:31:04 +02:00
Rolf Bjarne Kvinge 58ae71bbd0
Bump maccore. (#12557)
* Bump maccore.

New commits in xamarin/maccore:

* xamarin/maccore@62e6757515 [provisioning-profiles] Show more output from fetching the latest provisioning profiles. (#2504)
* xamarin/maccore@d9dcac2172 [submissions] Add ported samples. (#2503)
* xamarin/maccore@9473912ea3 [submission] Use a different bundle identifier for FSharpMacCoolApp to not clash with another test app. (#2502)
* xamarin/maccore@f235bd6454 Update vseng-xamarin-mac-devices.p12 (#2499)
* xamarin/maccore@2fba9b0761 [submissions] Fix string interpolation. (#2501)
* xamarin/maccore@32acd3aa82 [certificates] Update la_dev_apple.p12, la_distr_apple.p12 and la_mac_installer_distr.p12. (#2500)

Diff: 8bb7dc6c38..62e6757515

* Bump again.

New commits in xamarin/maccore:

* xamarin/maccore@3e591cbcb1 [provisioning-profiles] Add intermediate cert to the keychain. (#2506)

Diff: 62e6757515..3e591cbcb1
2021-08-26 17:26:07 +02:00
Rolf Bjarne Kvinge c09cf23682
Bump maccore. (#12523)
New commits in xamarin/maccore:

* xamarin/maccore@8bb7dc6c38 [docfixer] Add error checking to fix #xamarin/maccore@2479. (#2498)

Diff: 93d0469437..8bb7dc6c38
2021-08-25 09:21:05 +02:00