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 main into xcode14.1. #16327

Merged
merged 7 commits into from
Oct 14, 2022
Merged

Merge main into xcode14.1. #16327

merged 7 commits into from
Oct 14, 2022

Conversation

rolfbjarne
Copy link
Member

No description provided.

@rolfbjarne
[msbuild] Only sign the app bundle if codesigning is enabled. Fixes x…
7336100 
…amarin#16197. (xamarin#16266)

Only sign the app bundle if codesigning is enabled.

This fixes a bug where we'd still try to sign an app bundle, even if the user
disabled code signing by setting EnableCodeSigning=false, if the default logic
was to sign the app bundle.

Fixes xamarin#16197.
@rolfbjarne
[dotnet] Hardcode 'true' as the default value for GenerateSatelliteAs…
9e3dbf2 
…sembliesForCore. Fixes xamarin#16193. (xamarin#16306)

Hardcode 'true' as the default value for GenerateSatelliteAssembliesForCore,
because .NET gets it wrong when building from inside VS (Windows).

When building using either VSMac or the command line (either from Windows or
Mac), the `MSBuildRuntimeType` property is set to `Core`, and as a result, the
default value for `GenerateSatelliteAssembliesForCore` is `true`:

```xml
<GenerateSatelliteAssembliesForCore Condition=" '$(GenerateSatelliteAssembliesForCore)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">true</GenerateSatelliteAssembliesForCore>
```

See: https://github.com/dotnet/sdk/blob/00100960bf06cb595daba647673cd0329be896f4/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets#L41

This is the correct behavior.

However, when building from inside Visual Studio (for Windows), the
`MSBuildRuntimeType` property is set to `Full`, and thus
`GenerateSatelliteAssembliesForCore` is not set to `true`, and we end up
executing al.exe to generate satellite assemblies, which is wrong (al.exe
complains that 'arm64' is an invalid platform).

Fix this by always defaulting `GenerateSatelliteAssembliesForCore` to `true`,
independent on where we're executing.

Ref: dotnet/sdk#28419.

Fixes xamarin#16193.
@rolfbjarne
[devops] Add a makefile target to run yamllint on our yaml files. (xa…
a047ce5 
…marin#16298)

Also fix all our yaml files according to yamllint. This is mostly whitespace changes.
@rolfbjarne
[autoformat] Add mmp.csproj. (xamarin#16313)
ee7e95d
@rolfbjarne
[devops] Make each platform its own maestro build. (xamarin#16301)
74641f1 
This will hopefully make it easier to correctly subscribe to our maestro feeds
and only pick certain platforms.

It also fixes a problem where publishing wouldn't work unless we were building
for iOS, because the code was assuming that iOS was always enabled.
@rolfbjarne
[autoformat] Add mtouch.csproj. (xamarin#16316)
2d9f9c3 
This also required modifying mtouch.csproj, otherwise the wrong settings would
be applied.
@rolfbjarne
Merge main into xcode14.1.
eec5f62
@rolfbjarne rolfbjarne added the not-notes-worthy Ignore for release notes label Oct 13, 2022
@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

❗ API diff vs stable (Breaking changes)

Legacy Xamarin (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
.NET (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
Legacy Xamarin (stable) vs .NET

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: eec5f62054562b2fa2fbe6b2d2695939242bc21d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

  • monotouch-test

Pipeline on Agent
Hash: eec5f62054562b2fa2fbe6b2d2695939242bc21d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1168.Monterey'
Hash: eec5f62054562b2fa2fbe6b2d2695939242bc21d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: simulator tests

0 tests crashed, 11 tests failed, 217 tests passed.

Failures

❌ bcl tests

3 tests failed, 66 tests passed.
  • [NUnit] Mono BCL tests group 1/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • [xUnit] Mono BCL tests group 5/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • [xUnit] Mono SystemCoreXunit Part 2/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut

Html Report (VSDrops) Download

❌ introspection tests

1 tests failed, 12 tests passed.
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 6.0): Crashed Known issue: HE0038)

Html Report (VSDrops) Download

❌ linker tests

6 tests failed, 59 tests passed.
  • dont link/iOS Unified 64-bits - simulator/Release [dotnet]: LaunchTimedOut
  • dont link/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • link all/iOS Unified 64-bits - simulator/Release [dotnet]: LaunchTimedOut
  • link all/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • link all/iOS Unified 64-bits - simulator/Release: LaunchTimedOut
  • trimmode copy/iOS Unified 64-bits - simulator/Debug [dotnet]: LaunchTimedOut

Html Report (VSDrops) Download

❌ msbuild tests

1 tests failed, 1 tests passed.
  • MSBuild tests/Tasks: BuildFailure

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 23 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: simulator tests

0 tests crashed, 8 tests failed, 220 tests passed.

Failures

❌ bcl tests [attempt 2]

3 tests failed, 66 tests passed.
  • [NUnit] Mono BCL tests group 2/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • [xUnit] Mono BCL tests group 5/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • [xUnit] Mono SystemCoreXunit Part 1/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut

Html Report (VSDrops) Download

❌ introspection tests [attempt 2]

1 tests failed, 12 tests passed.
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 6.0): Crashed Known issue: HE0038)

Html Report (VSDrops) Download

❌ linker tests [attempt 2]

4 tests failed, 61 tests passed.
  • link all/iOS Unified 64-bits - simulator/Debug [dotnet]: LaunchTimedOut
  • link all/iOS Unified 64-bits - simulator/Release: LaunchTimedOut
  • trimmode link/iOS Unified 64-bits - simulator/Debug [dotnet]: LaunchTimedOut
  • dont link/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 23 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: simulator tests

0 tests crashed, 4 tests failed, 224 tests passed.

Failures

❌ bcl tests [attempt 3]

3 tests failed, 66 tests passed.
  • [NUnit] Mono BCL tests group 2/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • [xUnit] Mono BCL tests group 3/iOS Unified 64-bits - simulator/Debug: LaunchTimedOut
  • [xUnit] Mono SystemXunit/tvOS - simulator/Debug: Crashed

Html Report (VSDrops) Download

❌ introspection tests [attempt 3]

1 tests failed, 12 tests passed.
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 6.0): Crashed Known issue: HE0038)

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. [attempt 3] Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 23 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

@rolfbjarne
Copy link
Member Author

Test failures are unrelated (https://github.com/xamarin/maccore/issues/2450, #16317).

@rolfbjarne rolfbjarne merged commit 9a7740b into xamarin:xcode14.1 Oct 14, 2022
@rolfbjarne rolfbjarne deleted the bump-main-in-xcode14.1-2022-10-13 branch October 14, 2022 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@dalexsoto dalexsoto dalexsoto approved these changes

@chamons chamons Awaiting requested review from chamons

@emaf emaf Awaiting requested review from emaf emaf is a code owner

@mauroa mauroa Awaiting requested review from mauroa mauroa is a code owner

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

Successfully merging this pull request may close these issues.
4 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @mandel-macaque