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

780 Коммитов

Автор SHA1 Сообщение Дата
Rolf Bjarne Kvinge 81325b3b37
Merge xcode14.1 into net7.0-xcode14.1. (#16432) 2022-10-28 13:50:47 +02:00
Rolf Bjarne Kvinge c708c71c3b Merge remote-tracking branch 'origin/xcode14.1' into bump-xcode14.1-in-net7.0-xcode14.1-2022-10-24 2022-10-28 09:50:14 +02:00
dotnet-maestro[bot] 12f8af16c6
[net7.0-xcode14.1] Update dependencies from dotnet/installer (#16455)
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 7.0.0-rtm.22479.3 to 7.0.0-rtm.22512.1 (parent: Microsoft.Dotnet.Sdk.Internal)

## From https://github.com/dotnet/installer
- **Subscription**: df408977-ead8-4cfb-e40b-08dab20af502
- **Build**: 20221019.39
- **Date Produced**: October 20, 2022 12:51:36 AM UTC
- **Commit**: e6dd91c290b808f971a1ac69c2fb29395bbf1051
- **Branch**: refs/heads/release/7.0.1xx

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 7.0.100-rtm.22479.5 to 7.0.100-rtm.22519.39][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22512.1][4]

[3]: eb23d8c...e6dd91c
[4]: 02d62cf...c686535

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <github-actions@xamarin.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-10-27 12:08:56 +02:00
Alex Soto 04ebd2f6c6
[xcode14.1] Bump Xcode to RC 2 (#16438)
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-10-25 15:26:34 +02:00
Rolf Bjarne Kvinge 51a7f07f20
[net7.0-xcode14.1] Make the buffer bigger between .NET 6 and .NET 7 nugets for Xcode 14.1 (#16430)
Current versions in this branch:

    Microsoft.iOS 16.1.1419-net7.0-xcode14.1+sha.51ad25e7b64
    Microsoft.tvOS 16.1.1419-net7.0-xcode14.1+sha.51ad25e7b64
    Microsoft.MacCatalyst 16.1.1419-net7.0-xcode14.1+sha.51ad25e7b64
    Microsoft.macOS 13.0.1974-net7.0-xcode14.1+sha.51ad25e7b64

Compare with the `release/6.0.4xx-xcode14.1` branch version numbers (from #16431):

	Microsoft.iOS 16.1.179+sha.2107639a131
	Microsoft.tvOS 16.1.179+sha.2107639a131
	Microsoft.MacCatalyst 16.1.179+sha.2107639a131
	Microsoft.macOS 13.0.734+sha.2107639a131

the buffer is >1000 commits.
2022-10-25 08:29:15 +02:00
Rolf Bjarne Kvinge ae07f49b4e Fix the prerelease versioning for this branch. 2022-10-21 09:01:58 +02:00
Rolf Bjarne Kvinge 24f1fc18ed Merge remote-tracking branch 'origin/xcode14.1' into net7.0-xcode14.1 2022-10-20 19:30:22 +02:00
Alex Soto f414cfa6ca
[xcode14.1] Bump to Xcode 14.1 Release Candidate (#16379) 2022-10-19 07:56:47 +02:00
Rolf Bjarne Kvinge 57307a4168
Merge main into xcode14.1. (#16364) 2022-10-18 08:03:58 +02:00
Rolf Bjarne Kvinge a15b2e0fe0
Bump min watchOS simulator version. (#16317) 2022-10-17 17:57:47 +02:00
Rolf Bjarne Kvinge cb6f555665 Merge main into xcode14.1. 2022-10-17 11:35:33 +02:00
Rolf Bjarne Kvinge 5975ffd6f1 Merge main into net7.0. 2022-10-17 10:21:24 +02:00
Rolf Bjarne Kvinge 05939b5e86
[xtro] Don't allow entries in 'common' ignore files that aren't actually common to all platforms for a given framework. Fixes #12769. (#16342)
This makes it possible to run xtro consistently when not all platforms are
enabled.

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

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
2022-10-14 09:29:59 +02:00
Rolf Bjarne Kvinge 34ced976e2
[net7.0] Disable legacy Xamarin builds. (#16335)
We don't need legacy Xamarin builds in .NET 7, so this will hopefully speed up
our builds (and posterior signing) significantly.

This change should not be merged back into main.
2022-10-14 09:20:31 +02:00
Rolf Bjarne Kvinge 71657cfe83
Disable objc_msgSend stubs in clang. Fixes #16223. (#16231)
Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from
earlier Xcodes doesn't understand. We disable this by passing
-fno-objc-msgsend-selector-stubs to clang.

Ref: https://developer.apple.com/videos/play/wwdc2022/110363/
Ref: https://www.wwdcnotes.com/notes/wwdc22/110363/
Ref: https://github.com/llvm/llvm-project/issues/56034

Fixes https://github.com/xamarin/xamarin-macios/issues/16223.
2022-10-05 08:43:24 +02:00
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 15e9683a53 Bump main in net7.0. 2022-09-22 07:55:18 +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
Rolf Bjarne Kvinge 56643725ad Merge remote-tracking branch 'origin/net7.0' into bump-main-in-net7.0-2022-09-16 2022-09-19 14:10:54 +02:00
Rolf Bjarne Kvinge 85e3332b82 Merge remote-tracking branch 'origin/main' into bump-main-in-net7.0-2022-09-16 2022-09-19 14:10:49 +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
dotnet-maestro[bot] baf4942685
[net7.0] Update dependencies from dotnet/installer (#15924)
This pull request updates the following dependencies

## From https://github.com/dotnet/installer
- **Subscription**: fa8142cc-91f4-4845-3384-08da5a845ad2
- **Build**: 20220916.29
- **Date Produced**: September 17, 2022 1:31:01 AM UTC
- **Commit**: e60f1ae17fcdb5261eb479f5878ecbf48f81fd70
- **Branch**: refs/heads/release/7.0.1xx

- **Updates**:
  - **Microsoft.Dotnet.Sdk.Internal**: [from 7.0.100-rc.2.22458.3 to 7.0.100-rtm.22466.29][12]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.0-rc.2.22452.11 to 7.0.0-rc.2.22465.19][13]

[12]: 0945d95...e60f1ae
[13]: 59a0a28...5b84d4c

## 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 7.0.0-rc.2.22452.11 to 7.0.0-rc.2.22465.19 (parent: Microsoft.Dotnet.Sdk.Internal)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <github-actions@xamarin.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-09-19 11:22:46 +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 a0ebd954c3 Bump to dotnet/runtime/release/7.0@608da95f.
Stop relying on dotnet/installer to provide dotnet/runtime bumps.

Ref: https://github.com/xamarin/xamarin-android/pull/7319
2022-09-01 18:39:22 +02:00
Rolf Bjarne Kvinge 4922bf4570 Merge remote-tracking branch 'origin/main' into bump-main-in-net7.0-2022-08-31 2022-08-31 13:45:17 +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 a932ca2d7c Merge remote-tracking branch 'origin/main' into bump-main-in-net7.0-2022-08-26 2022-08-26 13:22:24 +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
dotnet-maestro[bot] 62055c56fb
[net7.0] Update dependencies from dotnet/installer (#15657)
* Update dependencies from https://github.com/dotnet/installer build 20220807.1

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22407.1

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22408.5

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22409.23

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22410.15

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22412.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22411.2 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22413.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22412.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22414.7

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22412.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22416.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22415.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

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

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.2.22417.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22415.4 (parent: Microsoft.Dotnet.Sdk.Internal

* Re-generate global.json

* [dotnet] Include the 'marshal-ilgen' component. Fixes #15668.

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

* [dotnet] Enable serialization discovery in the linker. Fixes #15676.

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

* [tests] Make the dont link tests actually not link for macOS.

* [tests] The 'trimmode copy' test needs an adjustment after recent linker changes.

* [dotnet] Don't set a default 'TrimMode' value.

We already compute a TrimMode value depending on other properties
(MtouchLink/LinkMode - or a default value if those aren't set), and the logic
to compute the default value is not executed if we set a TrimMode default (because
TrimMode overrides any MtouchLink/LinkMode values).

* [tests] Workaround a bug in 'dotnet build'.

Workaround a bug in 'dotnet build' where escaping semicolons interferes with
our ability to pass RuntimeIdentifiers to the build on the command line.

* [dotnet] Update expected bundle contents according to updated runtime.

* [tests] Update expected error message texts.

* Bump to RC 2.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <github-actions@xamarin.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2022-08-19 12:53:56 +02: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
Rolf Bjarne Kvinge 542f74d837 Bump to RC 1 2022-07-14 10:15:37 +02: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 5e993ebe49 Merge remote-tracking branch 'origin/main' into net7.0 2022-07-12 11:18:39 +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 b44632a7dc [dotnet] It doesn't look like we need to download the mono toolchain anymore either. 2022-07-01 11:56:02 +02:00