Skip to content

[net7.0] Merges PR#15368 and PR#15496 into net7.0 branch and some 🍒 picks from main #15636

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
Closed
wants to merge 62 commits into from
Closed

[net7.0] Merges PR#15368 and PR#15496 into net7.0 branch and some 🍒 picks from main #15636

wants to merge 62 commits into from

Conversation

@dalexsoto
Copy link
Member

@dalexsoto dalexsoto commented Aug 4, 2022 •
edited
Loading

Merges PR #15368 and PR #15496 into net7.0 branch and some cherry-picks from main.

We are trying to fix https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1583660 and bump everything to RC1.

agocke and others added 30 commits June 28, 2022 11:47
@agocke
Set TrimMode to partial if not set
d67523d 
Companion to dotnet/linker#2856
@agocke
Missed a few more places where _LinkMode was used
a14002a
@agocke
Update DefaultAction call
6854d31
@agocke
Merge branch 'main' into set-trimmode-partial
c558df7
@agocke
Update Xamarin.Shared.Sdk.targets
b8af230
@rolfbjarne
Fix whitespace
4c3cb2e
@rolfbjarne
Simplify a bit.
381ca5e
@rolfbjarne
Merge remote-tracking branch 'origin/net7.0' into set-trimmode-partial
4c6a35b
@agocke
Update linker version
1069837
@rolfbjarne
Merge remote-tracking branch 'origin/net7.0' into set-trimmode-partial
2864a71
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
7fe9c68 
…220713.32

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22363.32

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22362.3 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
74610c1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
eb8afba 
…220714.28

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22364.28

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22362.3 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
18e5f90
@rolfbjarne
Fix linking nothing.
621fc54
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
8282bd6 
…220715.7

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22365.7

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22364.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
fff15a5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
6b6d7ff 
…220718.2

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22368.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22365.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
cb4b77c
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
70ecfae 
…220718.24

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22368.24

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
8f93b55
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
37c9c5e 
…220719.6

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22369.6

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
da1579c
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
4736252 
…220720.12

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22370.12

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
4454f70
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
c4977a9 
…220721.5

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22371.5

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
363b36f
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
85d5e7e 
…220722.3

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22372.3

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal
Re-generate global.json
e4f9b58
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
86d4995 
…220724.1

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22374.1

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref
 From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal
mandel-macaque
mandel-macaque approved these changes Aug 4, 2022
View reviewed changes
Copy link
Contributor

@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.

All the needed CI changes are present.

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@jonathanpeppers
Copy 7.0.100 sdk-manifest files
8e43594 
The build was failing with errors like:

    Could not find workload 'microsoft-net-runtime-tvos' extended by workload 'tvos' in manifest 'microsoft.net.sdk.tvos'

I found I could copy the mono/emscripten workloads from 7.0.100 to
7.0.100-rc.1 to get past this.

I looked at the xamarin-android build tree, and we were doing this...

But I don't exactly remember why -- or if it was Peter or I that did it.
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Aug 5, 2022

🔥 Failed to compare API and create generator diff 🔥

Error: 'make' failed for the hash 8e43594.

Pipeline on Agent
Hash: efb3a0ed77412e0cd4c55b19148ef74aa26916bb [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Aug 5, 2022

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

No test package could be found for tests on macOS M1 - Mac Big Sur (11.5)

Pipeline on Agent
Hash: efb3a0ed77412e0cd4c55b19148ef74aa26916bb [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Aug 5, 2022

❌ [PR Build] Tests on macOS Mac Catalina (10.15) failed ❌

No test package could be found for tests on macOS Mac Catalina (10.15)

Pipeline on Agent
Hash: efb3a0ed77412e0cd4c55b19148ef74aa26916bb [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Aug 5, 2022

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1098.Monterey'
Hash: efb3a0ed77412e0cd4c55b19148ef74aa26916bb [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

vs-mobiletools-engineering-service2 commented Aug 5, 2022

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: simulator tests

🎉 All 0 tests passed 🎉

Failures

❌ bcl tests

🔥 Failed catastrophically on VSTS: simulator tests - bcl (no summary found).

Html Report (VSDrops) Download

❌ cecil tests

🔥 Failed catastrophically on VSTS: simulator tests - cecil (no summary found).

Html Report (VSDrops) Download

❌ dotnettests tests

🔥 Failed catastrophically on VSTS: simulator tests - dotnettests (no summary found).

Html Report (VSDrops) Download

❌ fsharp tests

🔥 Failed catastrophically on VSTS: simulator tests - fsharp (no summary found).

Html Report (VSDrops) Download

❌ framework tests

🔥 Failed catastrophically on VSTS: simulator tests - framework (no summary found).

Html Report (VSDrops) Download

❌ generator tests

🔥 Failed catastrophically on VSTS: simulator tests - generator (no summary found).

Html Report (VSDrops) Download

❌ interdependent_binding_projects tests

🔥 Failed catastrophically on VSTS: simulator tests - interdependent_binding_projects (no summary found).

Html Report (VSDrops) Download

❌ install_source tests

🔥 Failed catastrophically on VSTS: simulator tests - install_source (no summary found).

Html Report (VSDrops) Download

❌ introspection tests

🔥 Failed catastrophically on VSTS: simulator tests - introspection (no summary found).

Html Report (VSDrops) Download

❌ linker tests

🔥 Failed catastrophically on VSTS: simulator tests - linker (no summary found).

Html Report (VSDrops) Download

❌ mac_binding_project tests

🔥 Failed catastrophically on VSTS: simulator tests - mac_binding_project (no summary found).

Html Report (VSDrops) Download

❌ mmp tests

🔥 Failed catastrophically on VSTS: simulator tests - mmp (no summary found).

Html Report (VSDrops) Download

❌ mononative tests

🔥 Failed catastrophically on VSTS: simulator tests - mononative (no summary found).

Html Report (VSDrops) Download

❌ monotouch tests

🔥 Failed catastrophically on VSTS: simulator tests - monotouch (no summary found).

Html Report (VSDrops) Download

❌ msbuild tests

🔥 Failed catastrophically on VSTS: simulator tests - msbuild (no summary found).

Html Report (VSDrops) Download

❌ mtouch tests

🔥 Failed catastrophically on VSTS: simulator tests - mtouch (no summary found).

Html Report (VSDrops) Download

❌ xammac tests

🔥 Failed catastrophically on VSTS: simulator tests - xammac (no summary found).

Html Report (VSDrops) Download

❌ xcframework tests

🔥 Failed catastrophically on VSTS: simulator tests - xcframework (no summary found).

Html Report (VSDrops) Download

❌ xtro tests

🔥 Failed catastrophically on VSTS: simulator tests - xtro (no summary found).

Html Report (VSDrops) Download

Successes

Pipeline on Agent
Hash: [PR build]

@dalexsoto
Copy link
Member Author

dalexsoto commented Aug 7, 2022

Closing in favor of #15651

@dalexsoto dalexsoto closed this Aug 7, 2022
@dalexsoto dalexsoto deleted the net7.0-all-in-one branch August 7, 2022 01:39
@dalexsoto dalexsoto mentioned this pull request Aug 7, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tj-devel709 tj-devel709 tj-devel709 approved these changes

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

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

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

@chamons chamons Awaiting requested review from chamons

+1 more reviewer

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

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@dalexsoto @vs-mobiletools-engineering-service2 @mandel-macaque @tj-devel709 @agocke @rolfbjarne @emaf @mauroa @chamons @jonathanpeppers