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

728 Коммитов

Автор SHA1 Сообщение Дата
Alex Soto 27e6958b0a
[xcode14.1] Bump to Xcode 14.1 Beta 3 (#16010)
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-10-03 17:24:41 +02:00
VS MobileTools Engineering Service 2 3b9de9c4f0
[xcode14.1] Bump API references to Xcode 14 stable release for iOS, tvOS and watchOS. (#16168)
Backport of #16150

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-09-30 14:47:11 +02:00
Rolf Bjarne Kvinge f4d5e6eeab Merge main into xcode14.1. 2022-09-22 07:50:58 +02:00
Rolf Bjarne Kvinge a3b4555ce9
[dotnet] Bump API references to the latest 6.0.4xx (454) release. (#16055) 2022-09-22 07:17:12 +02:00
Rolf Bjarne Kvinge b0aa5d0917
Merge main into xcode14.1. (#16036) 2022-09-21 20:39:52 +02:00
Rolf Bjarne Kvinge e92309e684
Xcode 14.1 beta 1 requires macOS 12.5. (#15999) 2022-09-20 13:59:21 +02:00
Rolf Bjarne Kvinge 4dcfaa3d05 Merge main into xcode14.1. 2022-09-20 13:57:49 +02:00
dotnet-maestro[bot] 249f470e57
[main] Update dependencies from dotnet/runtime (#15886)
This pull request updates the following dependencies

## From https://github.com/dotnet/runtime
- **Subscription**: 0f76eea3-d4b0-4229-e732-08d9ecb01c9c
- **Build**: 20220916.13
- **Date Produced**: September 17, 2022 2:53:53 AM UTC
- **Commit**: cdf48abd370f148a537960141f73769e678660e7
- **Branch**: refs/heads/release/6.0

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][15]
- **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.9 to
6.0.10][16]

[15]: 531f715...cdf48ab
[16]: 3f6c45a...c3fc739

## Coherency Updates

The following updates ensure that dependencies with a
*CoherentParentDependency*
attribute were produced in a build used as input to the parent
dependency's build.
See [Dependency Description
Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

- **Coherency Updates**:
- **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.9 to
6.0.10 (parent: Microsoft.NETCore.App.Ref)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-09-20 13:44:06 +02:00
Rolf Bjarne Kvinge b230ef3601 Merge remote-tracking branch 'origin/main' into bump-main-in-xcode14.1-2022-09-16 2022-09-19 14:11:45 +02:00
dotnet-maestro[bot] eab2bca993
[main] Update dependencies from dotnet/installer (#15424)
This pull request updates the following dependencies

## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.5 to 6.0.9 (parent: Microsoft.Dotnet.Sdk.Internal)

## From https://github.com/dotnet/installer
- **Subscription**: be6e1947-9e64-4217-c50e-08da52a3899f
- **Build**: 20220915.1
- **Date Produced**: September 15, 2022 7:51:35 AM UTC
- **Commit**: 1c38151cabb5771a1503aff6e5cecb435be4c69c
- **Branch**: refs/heads/release/6.0.4xx

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 6.0.301-rtm.22280.1 to 6.0.402-servicing.22465.1][147]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.9][148]

[147]: 283e9cf...1c38151
[148]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCe5f183b&targetVersion=GC3fe12b9&_a=files

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: GitHub Actions <github-actions@xamarin.com>
2022-09-19 11:38:44 +02:00
Rolf Bjarne Kvinge 41d71ff313
[build] Fix a c&p mistake in the code to compute the prerelease identifier. (#15970) 2022-09-16 18:40:25 +02:00
Rolf Bjarne Kvinge ff3aeb5073 Merge remote-tracking branch 'origin/main' into bump-main-in-xcode14-2022-08-30 2022-08-30 11:14:47 +02:00
Rolf Bjarne Kvinge 46907cb500
[dotnet] Disable warning about using a preview version of .NET. (#15780)
We're pretty much always using a preview version of .NET anyways.
2022-08-26 17:16:54 +02:00
Rolf Bjarne Kvinge 4289148b28 Merge remote-tracking branch 'origin/main' into bump-main-in-xcode14-2022-08-26 2022-08-26 13:24:27 +02:00
Rolf Bjarne Kvinge f08ae313bf
Improve console output by telling dotnet to not complain about any workload updates. (#15514) 2022-08-25 16:24:08 +02:00
Rolf Bjarne Kvinge 969e2b1798
Bump api references to latest 6.0.4xx / d17-3 builds. (#15739)
Also update the list of packages.
2022-08-25 09:48:47 +02:00
Alex Soto 5cdd06ffff
[xcode14] Bump to Xcode 14 Beta 6 (#15743)
No API changes
2022-08-24 15:03:46 -04:00
Alex Soto 652353a6f7
[xcode14] Merge release/6.0.400 into xcode14 (#15686)
We had a bunch of conflicting CI changes, I just took Xcode14 as the source of truth for those.
2022-08-17 14:15:15 +02:00
Alex Soto 1d40aa42dd
[xcode14] Bump to latest Xcode 14 Beta 5 (#15663)
* [xcode14] Bump to latest Xcode 14 Beta 5

* [CloudKit] Fix cloudkit intro on tvOS

* Revert "[Tests] Fix an monotouch-test test that landed broken. (#15503)"

This reverts commit 161de84bcf.

* Update tools/common/StaticRegistrar.cs

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>

* Fix typo

* [CHIP] Tell our drivers to not link CHIP at all

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-08-10 11:11:40 -04:00
Chris Hamons 4276c90260
[xcode14] Bump to beta 4 (#15584)
Co-authored-by: Alex Soto <alex@alexsoto.me>
2022-07-29 12:34:27 -05:00
Manuel de la Pena 80f1ac40f8
[Xcode14] Bump xcode 14 to beta 3. (#15420)
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-07-13 15:48:14 -04:00
Rolf Bjarne Kvinge f8ff530796 Merge remote-tracking branch 'origin/main' into xcode14-merge-main-2022-07-12 2022-07-12 14:52:32 +02:00
Rolf Bjarne Kvinge 3751d37a99
[dotnet] Use an arm64-based .NET local install on arm64 machines. Fixes #15375. (#15389)
Fixes https://github.com/xamarin/xamarin-macios/issues/15375.

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-07-11 20:00:53 +02:00
Manuel de la Pena 42d50096b9
[Xcode 14] Bump sharpie to a version that supports maccatalyst. (#15409) 2022-07-06 19:09:46 -04:00
Rolf Bjarne Kvinge a9bee06e72
[xcode14] Initial bump. (#15212)
* Use Xcode 14 beta 1
* Bump versions
* Fix numerous issues.

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
2022-06-30 17:29:04 +02:00
Manuel de la Pena 9a8d74b880
[Build] Allow to skip the build of Hotrestart. (#15380) 2022-06-30 09:18:42 -04:00
Manuel de la Pena ca8fba9678
Merge branch 'xcode14' into xcode14-initial-pr 2022-06-23 08:55:41 -04:00
Rolf Bjarne Kvinge 27d131a8e6
A .NET 'servicing' release is also a stable release. (#15311) 2022-06-23 08:56:07 +02:00
Rolf Bjarne Kvinge 62fa204225 Bump to Xcode 14 beta 2. 2022-06-22 23:52:04 +02:00
Rolf Bjarne Kvinge 6a7fe81a6b Bump Objective-Sharpie. 2022-06-21 16:42:55 +02:00
Rolf Bjarne Kvinge a358b493fd Merge remote-tracking branch 'origin/xcode14' into HEAD 2022-06-21 16:12:26 +02:00
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 913ef62e64 Merge remote-tracking branch 'origin/xcode14' into xcode14-initial-pr 2022-06-10 11:06:36 +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
Manuel de la Pena dfe1063e0f
Merge branch 'xcode14' into xcode14-initial-pr 2022-06-09 12:33:01 -04: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 03d72e3513 Bump to Xcode 14. 2022-06-07 08:46:01 +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