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

694 Коммитов

Автор SHA1 Сообщение Дата
Rolf Bjarne Kvinge e3bc284ab1
[build] Set DEVELOPER_DIR and MD_APPLE_SDK_ROOT to the Xcode we're using. (#15266)
This makes it not necessary to check for the currently selected Xcode in our
system dependency check. It also means it'll become much easier to work with
multiple branches simultaneously where each branch needs its own Xcode.
2022-06-20 09:52:21 +02:00
Rolf Bjarne Kvinge e974999d94
[apidiff] Bump the .NET reference files to the final stable version we released. (#15235) 2022-06-10 10:39:15 +02:00
Rolf Bjarne Kvinge 78c7918929
[build] Fix invalid cache management by 'dotnet tool restore'. (#15227)
Fix invalid cache management by 'dotnet tool restore' by deleting 'dotnet tool's cache.
2022-06-09 15:38:59 +02:00
Rolf Bjarne Kvinge e0e38e523c
[build] Remove more unused variables after the VS dependency was removed. (#15211) 2022-06-08 10:55:08 +02:00
Rolf Bjarne Kvinge a1d0b6eba9
Make our local .NET the default .NET for the build. (#15086)
Make our local .NET the default .NET (in the root's global.json), and then if
a directory wants to use the system .NET, then that directory would have to
opt-in (using its own global.json).

This way we don't have to copy global.json/NuGet.config files around to run
tests with the correct .NET setup.
2022-06-07 10:11:02 +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
Rolf Bjarne Kvinge 072219daf4
Make tput silent if there's an error. (#15073)
tput typically fails on bots (where there's no attahed terminal) with:

> tput: No value for $TERM and no -T specified

This avoids those messages in the logs.
2022-05-23 20:09:01 +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 735d4f7c55
Bump api references to the latest stable (d17-2). (#15010) 2022-05-13 09:05:14 +02:00
Rolf Bjarne Kvinge f7c89d1106
[make] Add better error message when the required Xcode isn't installed. (#14995)
Before:

    $ make whatever
    Print: Entry, ":ProductBuildVersion", Does Not Exist

After:

    $ make whatever
    The required Xcode (13.3) is not installed in /Applications/Xcode_13.3.0.app/Contents/Developer
2022-05-12 08:18:43 +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 d1b7606181
Adjust versioning scheme for .NET to make the third field the commit distance. (#14923)
Adjust our versioning scheme so that the NuGet version is
`Major.Minor.CommitDistance`. The previous scheme ("Major.Minor.<fixed-ish
version>") causes problems on branches producing stable builds, because each
new commit would end up with the same NuGet version, and we wouldn't be able
to push those to a NuGet feed because there might already be an existing
version there.

By using the commit distance in the NuGet version we ensure that every commit
has a different version.
2022-05-10 09:28:39 +02:00
Rolf Bjarne Kvinge c44c5d3540
Adjust versioning logic/instructions to support stable releases. (#14876)
This is a heavily modified backport of #14847.
2022-05-06 13:27:33 +02:00
Rolf Bjarne Kvinge 20212e6e26
Bump API reference for .NET to the 6.0.3xx branch. (#14888) 2022-05-04 20:38:22 +02:00
Rolf Bjarne Kvinge 9e3938784f
Stop branding main as a release branch for .NET. (#14822)
Also bump our version band to try to avoid confusion.
2022-04-26 17:12:38 +02:00
dotnet-maestro[bot] d53c374d21
[main] Update dependencies from dotnet/installer (#14691)
* Update dependencies from https://github.com/dotnet/installer build 20220406.8

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22206.8

* Update dependencies from https://github.com/dotnet/installer build 20220407.16

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22207.16

* Update dependencies from https://github.com/dotnet/installer build 20220408.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22208.1

* Update dependencies from https://github.com/dotnet/installer build 20220409.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22209.1

* Update dependencies from https://github.com/dotnet/installer build 20220411.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22211.2

* Update dependencies from https://github.com/dotnet/installer build 20220412.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22212.2

* Update dependencies from https://github.com/dotnet/installer build 20220412.25

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22212.25

* Update dependencies from https://github.com/dotnet/installer build 20220413.48

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-rtm.22213.48

Dependency coherency updates

Microsoft.AspNetCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/dotnet/installer build 20220414.7

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-rtm.22214.7

Dependency coherency updates

Microsoft.AspNetCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Find .NET's csc compiler.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-04-20 10:32:54 +02:00
Alex Soto 0c1b7fb74b
Bump .NET in main to RC 3 2022-04-08 14:41:51 -04:00
Rolf Bjarne Kvinge 3d904dae2c
[tests] A few test fixes to make testing system installs better. (#14652)
* Make the custom-type-assembly library build using assemblies relative to
  MAC_DESTDIR, instead of poking into $(TOP)/_mac-build (for legacy Xamarin).
* Build the custom-type-assembly using a project file for .NET (and use our
  local .NET).
* Change the default for [IOS|MAC]_DESTDIR when TESTS_USE_SYSTEM is set to
  point to the system installation.
* Make sure 'MSBuildSDKsPath' isn't set when building the custom-type-assembly
  (set by xibuild), it breaks a lot of things.
2022-04-06 08:35:25 +02:00
Rolf Bjarne Kvinge f83db67a84
Use the tip of the 6.0.3xx-rc1 branch as the baseline for .NET API diffs. (#14623)
Since we're not planning on any more breaking changes after RC 1, we can
ensure we don't have any accidental breaking changes by using the RC 1
assemblies as the baseline.
2022-04-04 21:25:55 +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 345a518239
Bump .NET in main to RC 2 (#14528) 2022-03-29 08:56:44 +02:00
Rolf Bjarne Kvinge 2f099ea61d
[dotnet] Complete rename of DOTNET to SYSTEM_DOTNET. (#14535)
This was supposed to happen in d3643414e7, but
it looks like due to a merge conflict, this remaining part disappeared.
2022-03-29 07:12:00 +02:00
Rolf Bjarne Kvinge e44d0fd047
[.NET] Rename several DOTNET6_* variables to to DOTNET_*. (#14463)
Also rename DOTNET_VERSION to SYSTEM_DOTNET_VERSION to make it clear what it's
referring to (and to not clash with DOTNET6_VERSION which has now been renamed
to DOTNET_VERSION).

.NET 7 is right around the corner.
2022-03-23 08:07:34 +01:00
Rolf Bjarne Kvinge e369f466f7
[dotnet] Rename the DOTNET6 make variable to DOTNET. (#14441)
This is the follow-up to where the DOTNET variable was renamed SYSTEM_DOTNET.
2022-03-21 15:56:57 +01:00
Rolf Bjarne Kvinge 4d26b780c7
Bump the min macOS version to 12.0. (#14427)
Because that's what Xcode 13.3 requires.
2022-03-17 10:13:36 +01:00
Alex Soto 14c22e5c24
[xcode13.3] Use the stable release of Xcode 13.3 2022-03-15 10:08:13 -04:00
Alex Soto da31bc80a3 [xcode13.3] Bump to Xcode 13.3 RC 2022-03-14 22:54:34 -04:00
Alex Soto 35e2e45e98 [Xcode 13.3] Initial commit to Xcode 13.3 release 2022-03-14 22:54:33 -04: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
Rolf Bjarne Kvinge ed52b0f269
Bump .NET in main to RC 1 (#14277) 2022-03-01 17:01:55 +01:00
Rolf Bjarne Kvinge 8f5c8b1685
Bump ObjectiveSharpie to 3.5.50. (#14256)
This also requires updating the xtro definitions, because sharpie now finds
many more Mac Catalyst frameworks than before (and we haven't bound those
frameworks yet).
2022-02-26 01:59:11 +01:00
Rolf Bjarne Kvinge c589b4cf4e
[msbuild] Store the .NET version in the app's Info.plist when building an app using .NET. Fixes #14108. (#14215)
Also change the key for our Info.plist entry with the version number in .NET, and document the change.

We now use "com.microsoft.<platform in lower case>" instead of "com.xamarin.ios" (for all platforms).

Fixes https://github.com/xamarin/xamarin-macios/issues/14108.

Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
2022-02-24 20:44:42 +01:00
Rolf Bjarne Kvinge bd97933b60
[runtime] Remove ObjCRuntime.nfloat in favor of System.Runtime.InteropServices.NFloat. (#14197)
* Remove ObjCRuntime.nfloat (in favor of   System.Runtime.InteropServices.NFloat).
* Automatically add a reference to the System.Runtime.InteropServices.Internal
  package, so that developers get the new NFloat API (with operators) we've
  added post .NET 6 (but don't do this for .NET 7).
* Automatically add a global using alias for
  System.Runtime.InteropServices.NFloat -> nfloat. This is not behind the
  usual `ImplicitUsings` condition our other implicit usings are, because
  they're off by default for existing projects, and the main target for the
  global using alias for nfloat is upgraded projects.
* Automatically generate a global using alias (like above) in the generator
  for all code the generator compiles.
* Update xtro entries to reference System.Runtime.InteropServices.NFloat
  instead of ObjCRuntime.nfloat.
* Add a workaround for a hopefully temporary issue with .NET/CoreCLR where the
  wrong runtime pack is selected otherwise (without the new NFloat API, so
  nothing works at runtime).

Ref: https://github.com/xamarin/xamarin-macios/issues/13087
2022-02-24 16:51:12 +01:00
Rolf Bjarne Kvinge c0074d0c79
[dotnet] Hardcode the version band instead of inferring it. (#14225) 2022-02-23 20:43:27 +01:00
TJ Lambert 188a35d879
[ApiDiffs] More renaming to enable ApiDiffs (#14187)
There was a large change to rename a lot of our Xamarin assemblies to Microsoft
ie) Xamarin.iOS -> Microsoft.iOS

There is a mismatch with some of the prerequisites in our tools/apidiff/Makefile where dependencies 
are looking for ...Microsoft.iOS... but they are still named ...Xamarin.iOS...

This PR takes any remaining "Xamarin" names and changes them to "Microsoft" for all dotnet related rules.
We will also change other dotnet rules to use the new naming convention of "macOS" and "tvOS"

The only exception is to the Xamarin.PLATFORM.dll's coming from the zip - those remain as Xamarin.iOS.dll

We should expect to see the gists showing up in ApiDiffs from this PR!

Co-authored-by: TJ Lambert <tjlambert@microsoft.com>
2022-02-21 10:39:07 +01:00
dotnet-maestro[bot] 1273190e5f
[main] Update dependencies from dotnet/installer (#14156)
* Update dependencies from https://github.com/dotnet/installer build 20220211.11

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.201-servicing.22111.7 -> To Version 6.0.300-preview.22111.11

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.22069.1 -> To Version 6.0.100-1.21519.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/dotnet/installer build 20220216.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.201-servicing.22111.7 -> To Version 6.0.300-preview.22116.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.200-1.22069.1 -> To Version 6.0.100-1.21519.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Use the preview csc.

* Hardcode the toolchain version band to 6.0.200 for now.

* Bump dotnet/runtime to get nfloat changes.

* Add a dependency on Microsoft.NET.Workload.Emscripten.Manifest-6.0.100, and use it.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-02-17 15:29:41 +01:00
Rolf Bjarne Kvinge e25163f573
[.NET] Rename our product assemblies. Fixes #13748. (#13847)
Rename our product assemblies to:

* Microsoft.iOS.dll
* Microsoft.tvOS.dll
* Microsoft.macOS.dll
* Microsoft.MacCatalyst.dll

This makes it easy to distinguish between legacy Xamarin and .NET whenever the
product assembly is mentioned, and I've also chosen the platform part of the
name to match how the platforms are named elsewhere (this also makes it
possible to simplify our build logic, since we can remove a lot of special
casing).

Fixes https://github.com/xamarin/xamarin-macios/issues/13748.
2022-02-16 21:30:32 +01:00
Rolf Bjarne Kvinge d8e5cce46e
[runtime] Be a bit more explicit about format warnings related to security. (#14165) 2022-02-16 20:11:23 +01:00
Rolf Bjarne Kvinge a021ecae72
[test] Add help makefile targets to run .NET tests on remote machines. (#14144) 2022-02-16 07:57:09 +01: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
dotnet-maestro[bot] 22df9b993c
[main] Update dependencies from dotnet/installer (#13871)
* Update dependencies from https://github.com/dotnet/installer build 20220124.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.200-preview.22071.6 -> To Version 6.0.200-rtm.22074.2

* [.NET] Use the stable path for csc.

* Update dependencies from https://github.com/dotnet/installer build 20220125.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.200-preview.22071.6 -> To Version 6.0.200-rtm.22075.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks
 From Version 6.0.100-1.21519.4 -> To Version 6.0.200-1.22069.1 (parent: Microsoft.Dotnet.Sdk.Internal

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-01-27 10:13:42 +01:00
Manuel de la Pena 401bf76d70
[CI] Bump the min version of the simulators since Apple remove the old one. (#13906) 2022-01-26 14:46:58 -05:00
Rolf Bjarne Kvinge 8c7605a881
Bump .NET to Preview 14 (#13879)
Co-authored-by: Alex Soto <alex@alexsoto.me>
2022-01-26 09:38:50 +01:00
Rolf Bjarne Kvinge 214064d430 Merge remote-tracking branch 'origin/main' into dotnet-resolvedfiletopublish 2022-01-11 17:32:26 +01:00
Alex Soto 6515cfcfbf [dotnet] Bump to preview 13. 2022-01-05 14:29:12 -05:00
Alex Soto dfe6c2b5ab
[main] Add Xcode 13.2 Support (#13643)
* [Xcode13.2] Bump to Xcode 13.2 RC (#13497)

* [Xcode13.2] Bump to Xcode 13.2 Beta 2

Breaking changes addressed for legacy
* HomeKit
* CallKit
* CoreLocation

* [xcode13.2] Bump to Xcode 13.2 RC and apply feedback

* [AppKit] Fix missing Notifications

* Fix xtro

* [xcode13.2] Bump versions and use stable Xcode 13.2

* [monotouch-tests] Make TestAddingByComponents work on the last day of the year

Happy New Year!!

* NO BOM PLZ!
2022-01-03 09:28:00 -05:00
Rolf Bjarne Kvinge 0cc54bd76e [tests] Add build logic to build NuGets for testing purposes. 2021-12-22 10:17:34 +01:00
Rolf Bjarne Kvinge 9ab67cf9be Move some lookup tables in make to a more global location.
So that the tables can be used in more places.
2021-12-22 10:17:34 +01:00
dotnet-maestro[bot] 298c8089e8
[main] Update dependencies from dotnet/installer (#13561)
This pull request updates the following dependencies

## From https://github.com/dotnet/installer

- **Subscription**: 9d0987bd-c9b3-4f3a-a267-08d9ba6248b0
- **Build**: 20211215.3
- **Date Produced**: December 15, 2021 9:16:41 PM UTC
- **Commit**: 2dc0c5a0c9e30b861916e288676dc81d09ec9454
- **Branch**: refs/heads/release/6.0.2xx

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 6.0.102-servicing.21609.9 to 6.0.200-preview.21614.17][3]

[3]: 65bbb44...0ce201e

---

# .net ChangeLog for https://github.com/xamarin/xamarin-macios/pull/13561
## Level 1
* https://github.com/dotnet/installer [65bbb44...0ce201e](65bbb444f8...0ce201ed68)

## Level 2
* https://github.com/dotnet/templating [7d94161...7c35333](7d94161304...7c35333b66)
* https://github.com/dotnet/sdk [2c798cb...4a935da](2c798cbf6b...4a935da067)
* https://github.com/dotnet/fsharp [6d626ff...c12acdb](6d626ff075...c12acdbfa5)
* https://github.com/microsoft/vstest [68bd10d...a809880](68bd10d3ae...a809880e02)
* https://github.com/dotnet/roslyn [c7d6f9f...8183134](c7d6f9fab8...8183134263)
* https://github.com/dotnet/msbuild [c9eb9dd...96a618c](c9eb9dd64e...96a618ca59)
* https://github.com/nuget/nuget.client [078701b...9187a50](078701b97e...9187a50dae)
* https://github.com/dotnet/arcade [ee9b7f1...7421b55](ee9b7f1985...7421b55f46)
* https://github.com/dotnet/source-build-reference-packages [897a970...9c7c56c](897a9709eb...9c7c56c010)

Generated using https://github.com/spouliot/dotnet-tools/tree/master/changelog

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2021-12-16 17:35:17 +01:00
Rolf Bjarne Kvinge cc75748c90 [builds] Download & install the Mono workload as well. 2021-12-07 20:59:52 +01:00