Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge remote-tracking branch 'origin/d16-3' into xcode11.1 #7178

Merged
merged 7 commits into from
Oct 8, 2019
Merged

Merge remote-tracking branch 'origin/d16-3' into xcode11.1 #7178

merged 7 commits into from
Oct 8, 2019

Conversation

rolfbjarne
Copy link
Member

No description provided.

monojenkins and others added 7 commits September 19, 2019 18:48
@monojenkins @rolfbjarne
[xharness] Fix incorrect merge. (xamarin#7033)
300ee13 
Add new device tasks to the right list so that they're processed and marked as
ignored correctly later.
@VincentDondain
Bump maccore for device scheduling fix (xamarin#7029)
8e6e61b 
New commits in xamarin/maccore:

* xamarin/maccore@3064e2c463 [device-builds] Fix if condition typo (double `[`) (xamarin#1986)
* xamarin/maccore@e8bdf7a70f [tests] Treat Xcode GM as beta so we don't have to update all devices to GM (xamarin#1964) (xamarin#1973)

Diff: https://github.com/xamarin/maccore/compare/a86e78a3a1a7ea99b93e59f2fa60f384fca3bb32..3064e2c463e4700b20ce32ae4e522926ab622f8f
@monojenkins @VincentDondain
Use Xcode 11 final (xamarin#7073)
745dda4 
It's the same hash as Xcode 11 GM 2 but it's cleaner to actually use `Xcode11.app`.

In addition: the device bots are looking for "GM" and "beta" in the Xcode name to run on either the stable or beta pool.
@monojenkins @rolfbjarne
[builds] Stop shipping the 32-bit AOT compiler for Xamarin.Mac. (xama…
d532e90 
…rin#7042)
@VincentDondain @dalexsoto
[d16-3] Bump mono 2019-06@5608fe0a (xamarin#7126)
c2cbd34 
* [d16-3] Bump mono 2019-06@5608fe0a

New commits in mono/mono:

* mono/mono@5608fe0abb3 [2019-06] Update NETStandard 2.1 APIs (xamarin#17081)
* mono/mono@a5b8d6fcb5b [2019-06] Fix time zone issue when jumping into DST (xamarin#17062)
* mono/mono@390e6e124f5 Revert "[metadata] Fix leaks when handling a few attributes (xamarin#16675) (xamarin#16851)"
* mono/mono@459dd927dfd [2019-06] Bump bockbuild to get mono/bockbuild#121
* mono/mono@beb9a1b182a [sdks] Remove the mac32 build.
* mono/mono@747a919a06e [ci] Make ios/mac sdks archive URL more predictable
* mono/mono@114013096e1 [ci] Build iOS/Mac Mono sdks archive using Xcode 11
* mono/mono@10a24f3ea1d Implement WriteCore and ReadCore in DeflateStream
* mono/mono@a925846b1f0 [offsets-tool] Install clang into the user-specific python directory. (xamarin#16933)
* mono/mono@fe64a4765e6 [2019-06] Bump msbuild and sdk versions to 3.0.1xx latest (xamarin#16870)
* mono/mono@7293597b905 [corlib] Fix building nunit-lite twice (xamarin#16910)
* mono/mono@1648e886873 Rename bundle identifier for the various Mono.frameworks we create for Xamarin.iOS. Fixes xamarin#7005. (xamarin#16896)
* mono/mono@a6b5187d76a [metadata] Fix leaks when handling a few attributes (xamarin#16675) (xamarin#16851)
* mono/mono@7da9a041b3b [2019-06] Bump to mono/corefx@e79cf5b
* mono/mono@2b7050bdf36 [2019-06] Add RenamedEvent* to FSW sources from CoreFX (xamarin#16758)
* mono/mono@4f5ed502c6e [msbuild] pick up p4 versions
* mono/mono@f04ee2219d5 [2019-06][msbuid][roslyn] Bump msbuild and roslyn-binaries to pick up dotnet 3.0.100-p9 toolset
* mono/mono@6b4b99e571b Vtable [i] can be null so this should be check before use it. Fixes xamarin#16712

Diff: https://github.com/mono/mono/compare/7af64d1ebe9e9ee305cdae8ec5995c9521cbcf19..5608fe0abb3e501c461b2979a913c0bed3fe2a6d

* [tests] Adjust to non-fat macOS libraries from mono.
@monojenkins @mandel-macaque
[monotouch-test] Fix UrlProtocolTest after a server we don't control …
61bc898 
…changed its output. Fixes xamarin/maccore#2006. (xamarin#7157)

microsoft.com is doing user agent sniffing, and broke our our test since their
output is now different. Switch to example.com instead.

Fixes xamarin/maccore#2006.
@rolfbjarne
Merge remote-tracking branch 'origin/d16-3' into xcode11.1
37a9bba
mandel-macaque
mandel-macaque approved these changes Oct 4, 2019
View reviewed changes
Copy link
Member

@mandel-macaque mandel-macaque left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but we might just want to do the bump, right?

@monojenkins
Copy link
Collaborator

Build failure
✅ Build succeeded
✅ API Diff (from stable)
✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)
🔥 Test run failed 🔥

Test results

2 tests failed, 148 tests passed.

Failed tests

  • [NUnit] Mono BCL tests group 2/iOS Unified 32-bits - simulator/Debug: Failed
  • [NUnit] Mono BCL tests group 2/iOS Unified 64-bits - simulator/Debug: Failed

@spouliot spouliot added this to the xcode11.1 milestone Oct 7, 2019
dalexsoto
dalexsoto approved these changes Oct 7, 2019
View reviewed changes
Copy link
Member

@dalexsoto dalexsoto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes are weird but it might just be that we are good at back porting heh

@mandel-macaque
Copy link
Member

build

@monojenkins
Copy link
Collaborator

Build success
✅ Build succeeded
✅ API Diff (from stable)
✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)
✅ Test run succeeded

@dalexsoto dalexsoto merged commit 33e78af into xamarin:xcode11.1 Oct 8, 2019
@rolfbjarne rolfbjarne added the not-notes-worthy Ignore for release notes label Oct 8, 2019
@prmallic prmallic mentioned this pull request Oct 11, 2019
Merged
VincentDondain pushed a commit to VincentDondain/xamarin-macios that referenced this pull request Oct 16, 2019
@rolfbjarne @VincentDondain
Merge remote-tracking branch 'origin/d16-3' into xcode11.1 (xamarin#7178
d844db1 
)

* [xharness] Fix incorrect merge. (xamarin#7033)

Add new device tasks to the right list so that they're processed and marked as
ignored correctly later.

* Bump maccore for device scheduling fix (xamarin#7029)

New commits in xamarin/maccore:

* xamarin/maccore@3064e2c463 [device-builds] Fix if condition typo (double `[`) (xamarin#1986)
* xamarin/maccore@e8bdf7a70f [tests] Treat Xcode GM as beta so we don't have to update all devices to GM (xamarin#1964) (xamarin#1973)

Diff: https://github.com/xamarin/maccore/compare/a86e78a3a1a7ea99b93e59f2fa60f384fca3bb32..3064e2c463e4700b20ce32ae4e522926ab622f8f

* Use Xcode 11 final (xamarin#7073)

It's the same hash as Xcode 11 GM 2 but it's cleaner to actually use `Xcode11.app`.

In addition: the device bots are looking for "GM" and "beta" in the Xcode name to run on either the stable or beta pool.

* [builds] Stop shipping the 32-bit AOT compiler for Xamarin.Mac. (xamarin#7042)

* [d16-3] Bump mono 2019-06@5608fe0a (xamarin#7126)

* [d16-3] Bump mono 2019-06@5608fe0a

New commits in mono/mono:

* mono/mono@5608fe0abb3 [2019-06] Update NETStandard 2.1 APIs (xamarin#17081)
* mono/mono@a5b8d6fcb5b [2019-06] Fix time zone issue when jumping into DST (xamarin#17062)
* mono/mono@390e6e124f5 Revert "[metadata] Fix leaks when handling a few attributes (xamarin#16675) (xamarin#16851)"
* mono/mono@459dd927dfd [2019-06] Bump bockbuild to get mono/bockbuild#121
* mono/mono@beb9a1b182a [sdks] Remove the mac32 build.
* mono/mono@747a919a06e [ci] Make ios/mac sdks archive URL more predictable
* mono/mono@114013096e1 [ci] Build iOS/Mac Mono sdks archive using Xcode 11
* mono/mono@10a24f3ea1d Implement WriteCore and ReadCore in DeflateStream
* mono/mono@a925846b1f0 [offsets-tool] Install clang into the user-specific python directory. (xamarin#16933)
* mono/mono@fe64a4765e6 [2019-06] Bump msbuild and sdk versions to 3.0.1xx latest (xamarin#16870)
* mono/mono@7293597b905 [corlib] Fix building nunit-lite twice (xamarin#16910)
* mono/mono@1648e886873 Rename bundle identifier for the various Mono.frameworks we create for Xamarin.iOS. Fixes xamarin#7005. (xamarin#16896)
* mono/mono@a6b5187d76a [metadata] Fix leaks when handling a few attributes (xamarin#16675) (xamarin#16851)
* mono/mono@7da9a041b3b [2019-06] Bump to mono/corefx@e79cf5b
* mono/mono@2b7050bdf36 [2019-06] Add RenamedEvent* to FSW sources from CoreFX (xamarin#16758)
* mono/mono@4f5ed502c6e [msbuild] pick up p4 versions
* mono/mono@f04ee2219d5 [2019-06][msbuid][roslyn] Bump msbuild and roslyn-binaries to pick up dotnet 3.0.100-p9 toolset
* mono/mono@6b4b99e571b Vtable [i] can be null so this should be check before use it. Fixes xamarin#16712

Diff: https://github.com/mono/mono/compare/7af64d1ebe9e9ee305cdae8ec5995c9521cbcf19..5608fe0abb3e501c461b2979a913c0bed3fe2a6d

* [tests] Adjust to non-fat macOS libraries from mono.

* [monotouch-test] Fix UrlProtocolTest after a server we don't control changed its output. Fixes xamarin/maccore#2006. (xamarin#7157)

microsoft.com is doing user agent sniffing, and broke our our test since their
output is now different. Switch to example.com instead.

Fixes xamarin/maccore#2006.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

@mandel-macaque mandel-macaque mandel-macaque approved these changes

@VincentDondain VincentDondain VincentDondain approved these changes

Assignees
No one assigned
Labels
not-notes-worthy Ignore for release notes
Projects
None yet
Milestone
xcode11.1
Development

Successfully merging this pull request may close these issues.
7 participants
@rolfbjarne @monojenkins @mandel-macaque @dalexsoto @xamarin-release-manager @VincentDondain @spouliot