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

9760 Коммитов

Автор SHA1 Сообщение Дата
Alex Soto 72c7b1ffcc
[main][watchOS] Add x86_64 simulator support (#10059)
* [watchOS] Add x86_64 simulator support

* Build runtime/registrar x86_64 slices
* Produce a 64 bit version of Xamarin.WatchOS.dll
* Allow building x86_64 for watch simulators in mtouch
* Let xharness know about x86_64

* [tests] Add x86_64 arch to test-libraries

* Make dotnet package aware of x64

* [ObjCRuntime] Fix computing if we're calling a stret function or not in a 64-bit watchOS simulator.

* [xharness] Re-enable some watchOS tests.

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2020-11-20 09:27:46 -05:00
Rolf Bjarne Kvinge 3174e94a17
[mlaunch] Adjust build logic to ship mlaunch with the .NET nugets when we're building mlaunch as well. (#10122)
The original implementation only worked when we used mlaunch from the
macios-binaries repository.
2020-11-20 14:41:03 +01:00
Sebastien Pouliot d7bb2f2d9f
[msbuild] Fix missing localization in error (#10117) 2020-11-19 19:23:09 -05:00
Manuel de la Pena fb437d7860
[Maccore] Bump maccore to fix governance issues. (#10114)
All governance issues have been fixed.

Commits:

* Remove roslyn-analyzers files (#2149) 6c3fe624a9
* [Governance] Add ignores for the test profiles in maccore. (#2337) 5133d2cea1

Full diff: 8c98216efd..5133d2cea1
2020-11-19 12:33:45 -05:00
Rolf Bjarne Kvinge f4c9327fac
[dotnet] Bump to .NET 6.0.100-alpha.1.20556.2 and net6.0 (#10079)
This involves a few changes:

* Change everything to reference net6.0 instead of net5.0
* Update various variables to be NET6* instead of NET5*
* Reorder build logic to account for that our targets are imported earlier in
  the build process:

   In the latest .NET 6, our Workloads.targets is imported earlier in the
   build. This requires a few changes, because we still need to run most of
   our logic later in the process, which we do by adding targets files we
   want imported later to the AfterMicrosoftNETSdkTargets property.

   What we're loading as soon as possible:

   * Our version information (Xamarin.Shared.Sdk.Versions.targets)
   * The supported OS versions
     (Microsoft.<platform>.Sdk.SupportedTargetPlatforms.targets)
   * The default OS version
     (Xamarin.Shared.Sdk.TargetFrameworkInference.targets).

   This is all information that the .NET build require early on.

   Changes:

   * Rename all files that are loaded early to *.props.
   * Updated documentations to reflect these changes.
   * Remove Microsoft.<platform>.TargetFrameworkInference.targets, these
     files aren't used and don't contain anything useful.
   * Move the logic to calculate _ComputedTargetFrameworkMoniker has been
     delayed to later, because it needs TargetFrameworkMoniker set.

* Add a StoreAttributesStep to store attributes that are removed by the
  linker, but that the static registrar needs.

   In particular, in .NET 6 the linker removes the
   System.Runtime.CompilerServices.ExtensionAttribute, which the static
   registrar needs to handle category methods properly.

   This involved copying and slightly modifying the RemoveAttributesBase
   code.
2020-11-19 15:01:55 +01:00
Rolf Bjarne Kvinge b5a1908cfd
[msbuild] Use localized error strings instead of constants for a few errors. (#10111)
Seems like this got past the localization work somehow.
2020-11-19 08:26:05 +01:00
Manuel de la Pena ea0071823d
[Main] Bring all Xcode 12.2 changes to main. 2020-11-18 21:45:09 -05:00
Rolf Bjarne Kvinge 3ed6d978d5 [msbuild] Make sure '_AppContentsPath' is set for extension projects as well.
The '_GenerateBundleName' target is defined separately for normal projects and
extension projects, and only one of the was updated in a previous refactoring.
2020-11-18 22:16:09 +01:00
Rolf Bjarne Kvinge 7bc5e36f1e [msbuild] Fix codesign arguments for hardened runtime. 2020-11-18 22:02:28 +01:00
Rolf Bjarne Kvinge 6a726517b4
[msbuild] Stop allowing a watch family for iOS apps. (#10110)
A Watch family is no longer valid for an iOS app because we don't support
watchOS 1 anymore.
2020-11-18 17:57:32 +01:00
Manuel de la Pena f340fb92a3 Merge branch 'main' into main-xcode12.2 2020-11-18 11:45:50 -05:00
Manuel de la Pena 15a3060d65 [Tests] Fix msbuild tests after the test API changed. 2020-11-18 10:26:35 -05:00
Rolf Bjarne Kvinge f555c9656b
[jenkins] Clean more Xcodes. (#10102) 2020-11-18 12:18:53 +01:00
Manuel de la Pena 59748f187b
[Maccore] Bump maccore to remove old not needed code. (#10105)
The maccore lib dependency was a problem for governance checks. Also
removes the roslyn analyzer code.

Commits:

* [Deps] Remove Ionic.Zip. Is not needed and gives governance issues. (#8c98216) 8c98216efd
* Remove roslyn-analyzers files (#2149) 8c98216efd

Full diff: f490737c8e..6c3fe624a9
2020-11-17 18:36:39 -05:00
Manuel de la Pena 79e910f34e [APIDiff] Update api diff. 2020-11-17 15:23:41 -05:00
Manuel de la Pena f6010bee10 [AVFoundation] Fix merge issue. 2020-11-17 15:16:58 -05:00
Manuel de la Pena 6a7c1b32ac [Carplay] Remove not needed API that was added and remove. 2020-11-17 14:50:57 -05:00
Manuel de la Pena 999ddda01b [Xtro] Update xtro ignore files with the new mac os x bindings. 2020-11-17 12:07:19 -05:00
Manuel de la Pena 54f60948d6 [ApiTests] Add missing dot.
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
2020-11-17 11:16:20 -05:00
Manuel de la Pena a810f6954a [Security] Fix some tests after the bump to NUnitlite. 2020-11-17 11:14:04 -05:00
Manuel de la Pena 0f7bc75e50 Merge branch 'xcode12.2' into main-xcode12.2 2020-11-17 11:09:15 -05:00
Manuel de la Pena 3cc861d6a8
[Maccore] Bump maccore to fix governance issues. (#10101)
Commits:

* Insert keychain into search list without overwriting other keychains 243810037e
* Fix working in comment 243810037e
* Insert login keychain without overwriting other keychains in the search 7e6beed1d0
* Merge pull request #2332 from xamarin/yaml-pipeline-device-tests 7e6beed1d0
* Avoid adding duplicate keychains to keychain list (#2333) 7e6beed1d0
* [Governance] Fix some small polycheck issues. 51bea51d06
* [Governance] Fix some small polycheck issues. f490737c8e

Full diff: 6a86f16e0f..f490737c8e
2020-11-17 09:28:47 -05:00
Manuel de la Pena b949a93c40
[fileprovider] Fix breaking change (#10099)
Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
2020-11-16 16:47:27 -05:00
Rolf Bjarne Kvinge fd0e8e3d56 Bump to 6.0.100-alpha.1.20562.2 2020-11-16 15:59:29 +01:00
Rolf Bjarne Kvinge 5792c497d9 Merge remote-tracking branch 'origin/main' into dotnet-6.0.100-alpha.1.20559.4 2020-11-16 15:33:26 +01:00
Rolf Bjarne Kvinge 7218d51e1a One straggler! 2020-11-16 15:22:36 +01:00
Manuel de la Pena 13567cc11a
[VSMac] Bump max version to current stable. (#10092) 2020-11-13 16:07:24 -05:00
Přemek Vysoký 0fba63cdc7
[xharness] Remove Microsoft.DotNet.XHarness.iOS.Shared project and use NuGet instead (#9980) 2020-11-13 11:05:10 -05:00
Chris Hamons c2697b1bf3
Update CODEOWNERS. 👋 (#10090) 2020-11-13 09:20:14 -06:00
Sebastien Pouliot d4fb41b172
[tests] Update framework tests not to embed/zip the native binaries (#10073)
Manually added `NoBindingEmbedding` to bindings .csproj and removed
`[LinkWith]` attributes.

Also added support for NativeReference to harness and updated the
workaround for watchOS (since it can't link against ModelIO)

Fixed/adapted unit tests wrt change
2020-11-11 12:00:48 -05:00
Rolf Bjarne Kvinge d6756f4829 Merge remote-tracking branch 'origin/main' into dotnet-6.0.100-alpha.1.20559.4 2020-11-11 16:38:15 +01:00
Rolf Bjarne Kvinge 59cdbc6098 [dotnet] Disable a very eager linker optimization.
Fixes these monotouch-test tests:

   MonoTouchFixtures.CoreImage.CIKernelTests
      [FAIL] CIKernel_BasicTest :   CIKernel_BasicTest we disagree that it is a color kernel
         Expected: True
         But was:  False
            :    at MonoTouchFixtures.CoreImage.CIKernelTests.CIKernel_BasicTest()

   [FAIL] CIKernel_TestFromPrograms :   CIKernel_TestFromPrograms is neither type of kernel?
         Expected: True
         But was:  False
            :    at MonoTouchFixtures.CoreImage.CIKernelTests.CIKernel_TestFromPrograms()
2020-11-11 16:37:39 +01:00
Rolf Bjarne Kvinge cd362f8ffa
[msbuild] Remove unnecessary properties in Xamarin.Mac.Common.targets. (#10080)
The _ACTool_PartialAppManifestCache and _ACTool_BundleResourceCache are
duplicated (merge conflict resolution failure?), and also already present in
Xamarin.Shared.targets, so just remove these definitions.
2020-11-11 11:06:42 +01:00
Rolf Bjarne Kvinge bbc81dd80c
[dotnet] We're not doing anything with regards to the http handler, so we won't have a runtime-options.plist. (#10083) 2020-11-11 07:43:49 +01:00
Rolf Bjarne Kvinge d0d0a3dd93
[dotnet-linker] Remove AssemblyResolver.cs from the project, it's not needed. (#10081) 2020-11-11 07:42:34 +01:00
Rolf Bjarne Kvinge 9ada363d10
[mmp] Fix build. (#10082)
This broke in 59bc3c16ab, and wasn't caught because the Xamarin.Mac build is disabled.
2020-11-10 17:20:23 +01:00
Rolf Bjarne Kvinge 6a976dc454 [dotnet] Fix whitespace. 2020-11-10 17:17:15 +01:00
Rolf Bjarne Kvinge ef87ba0512 [dotnet-linker] Fix whitespace. 2020-11-10 17:17:15 +01:00
Rolf Bjarne Kvinge 59bc3c16ab
[tools] Add all our product constants to SdkVersions.cs and use them in dotnet-linker. (#10065)
Also, the correct constants to use is now determined by current platform in the Application
instance, instead of a constant value.
2020-11-10 14:21:47 +01:00
Rolf Bjarne Kvinge db23ca881a
[dotnet] Add _CreateDebugSettings, _CreateDebugConfiguration and _CreatePkgInfo to the targets we run on app creation. (#10061) 2020-11-10 13:44:26 +01:00
Rolf Bjarne Kvinge ac36750f49
[tests] Add a tvOS version of the dotnet introspection test project. (#10066)
* [tests] Move the dotnet introspection test project to a new test directory.

A tvOS project will come soon too, this makes the separation nicer.

* [tests] Add a tvOS version of the dotnet introspection test project.
2020-11-10 13:44:05 +01:00
Rolf Bjarne Kvinge 831f55796e [dotnet-linker] Add a StoreAttributesStep to store attributes that are removed by the linker.
Add a StoreAttributesStep to store attributes that are removed by the linker, but
that the static registrar needs.

In particular, in .NET 6 the linker removes the System.Runtime.CompilerServices.ExtensionAttribute,
which the static registrar needs to handle category methods properly.

This involved copying and slightly modifying the RemoveAttributesBase code.
2020-11-10 11:41:30 +01:00
Rolf Bjarne Kvinge 8f0ca7508a [dotnet] Reorder imports to account for that our targets are imported earlier in the build process.
In the latest .NET 6, our Workloads.targets is imported earlier in the build. This
requires a few changes, because we still need to run most of our logic later in the
process, which we do by adding targets files we want imported later to the AfterMicrosoftNETSdkTargets
property.

What we're loading as soon as possible:

* Our version information (Xamarin.Shared.Sdk.Versions.targets)
* The supported OS versions (Microsoft.<platform>.Sdk.SupportedTargetPlatforms.targets)
* The default OS version (Xamarin.Shared.Sdk.TargetFrameworkInference.targets).

This is all information that the .NET build require early on.

Changes:

* Rename all files that are loaded early to *.props.
* Updated documentations to reflect these changes.
* Remove Microsoft.<platform>.TargetFrameworkInference.targets, these files aren't
  used and don't contain anything useful.
* Move the logic to calculate _ComputedTargetFrameworkMoniker has been delayed
  to later, because it needs TargetFrameworkMoniker set.
2020-11-10 11:41:30 +01:00
Rolf Bjarne Kvinge c640775699 [dotnet] Bump to .NET 6.0.100-alpha.1.20556.2. and net6.0
New commits in spouliot/Touch.Unit:

* spouliot/Touch.Unit@f8768d9 Advance into the world of net6.0

Diff: 9abe69e6f5..f8768d99ef
2020-11-10 11:41:06 +01:00
Rolf Bjarne Kvinge 90d43ab86d
[mmp] Fix link path for Stripper.cs (#10062)
This makes the file show up in the right place (together with other files from
the tools/mtouch directory) in the solution explorer in VSMac.
2020-11-10 08:27:51 +01:00
Rolf Bjarne Kvinge 390b9e4b83
[dotnet-linker] Improve error reporting (#10064)
Improve error reporting in dotnet-linker by not requiring an instance of a LinkerConfiguration
to report errors. This is accomplished by making the LinkerConfiguration.Report method
a static method.

Otherwise reporting errors before we've successfully created a LinkerConfiguration
turns out to be troublesome (we end up throwing another exception, usually a NullReferenceException,
which is just confusing).
2020-11-10 08:27:28 +01:00
Alex Soto 42bec7dfa0
[mono] Bump mono to match android (#10069)
New commits in mono/mono:

* mono/mono@ac596375c7 Add support for OP_FCONV_TO_I to mini-arm64.c. (#20548)
* mono/mono@392fe5b87b [2020-02][watchOS] Add simwatch64 support (#20552)
* mono/mono@a22ed3f094 Fix potential crash for Encoder.Convert (#20522)
* mono/mono@970783731f Bump to F# 5.0 (#20511)
* mono/mono@32ab5066f7 Bump msbuild to fix a build issue
* mono/mono@93a7fe77e8 Ensure special static slots respect alignment. (#20506)
* mono/mono@3db5b35841 [debugger] Switch to GC Unsafe in signal handler callbacks (#20495)
* mono/mono@af315f44c4 [2020-02][corlib] ThreadAbortException protection for ArraySortHelper (#20468)

Diff: ca11fb0fd8..ac596375c7
2020-11-09 11:16:25 -05:00
Sebastien Pouliot 61cb18be6c
Bump Xcode 12.2 to RC (#10060)
Both xtro and intro looks fine locally, no update required.
2020-11-06 10:12:06 -05:00
Rolf Bjarne Kvinge 8b76cf4735
[dotnet] Fix MSBuild syntax. (#10055)
For some reason .NET 6 does not like spaces in certain places:

    MSB4259: Unexpected space at position "32" of condition [...]

So just remove them.
2020-11-06 14:01:19 +01:00
Rolf Bjarne Kvinge 06cd5722cc
[msbuild] Add SceneKit assets to our items included by default. (#10053) 2020-11-06 08:11:25 +01:00